Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QA Observation bugfix/FOUR-17019: Content of custom screen has an incorrect design #7109

Merged
merged 1 commit into from
Jul 24, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions resources/js/processes-catalogue/components/ProcessScreen.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<div id="process-screen">
<process-header
:process="process"
@goBack="goBack()"
@onProcessNavigate="onProcessNavigate()"
:enableCollapse="false"
/>
<process-header-start
:process="process"
@goBack="goBack()"
@onProcessNavigate="onProcessNavigate"
v-if="!mobileApp"
/>
<display-screen
v-if="showScreen"
:screen="screen"
Expand Down Expand Up @@ -55,7 +55,7 @@ import LaunchpadSettingsModal from "../../components/shared/LaunchpadSettingsMod
import ellipsisMenuMixin from "../../components/shared/ellipsisMenuActions";
import processNavigationMixin from "../../components/shared/processNavigation";
import ProcessesMixin from "./mixins/ProcessesMixin";
import ProcessHeader from "./ProcessHeader.vue";
import ProcessHeaderStart from "./ProcessHeaderStart.vue";

export default {
components: {
Expand All @@ -66,7 +66,7 @@ export default {
CreatePmBlockModal,
AddToProjectModal,
LaunchpadSettingsModal,
ProcessHeader,
ProcessHeaderStart,
},
mixins: [ellipsisMenuMixin, processNavigationMixin, ProcessesMixin],
props: ["process", "currentUserId"],
Expand All @@ -75,6 +75,7 @@ export default {
screen: {},
screen_id: "",
showScreen: false,
mobileApp: window.ProcessMaker.mobileApp,
};
},
mounted() {
Expand Down
Loading