Skip to content

Commit 770c05c

Browse files
authored
Merge pull request #7435 from ProcessMaker/feature/FOUR-18099
feature/FOUR-18099 STORY Tasks from Processes I manage section
2 parents 81eca76 + db3e03e commit 770c05c

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

resources/js/tasks/components/TasksList.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,10 @@ export default {
327327
type: String,
328328
default: "tasks",
329329
},
330+
verifyUrlToFalse: {
331+
type: Boolean,
332+
default: false
333+
}
330334
},
331335
data() {
332336
return {
@@ -846,7 +850,10 @@ export default {
846850
},
847851
verifyURL(string) {
848852
const currentUrl = window.location.href;
849-
const isInUrl = currentUrl.includes(string);
853+
let isInUrl = currentUrl.includes(string);
854+
if (this.verifyUrlToFalse) {
855+
isInUrl = false;
856+
}
850857
return isInUrl;
851858
},
852859
/**

resources/js/tasks/components/TasksPreview.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<splitpane-container v-if="showPreview" :size="splitpaneSize">
5252
<div
5353
ref="tasks-preview"
54-
class="tasks-preview h-100 p-3"
54+
class="tasks-preview h-100 p-3 position-relative"
5555
>
5656
<div class="d-flex w-100 mb-3">
5757
<slot name="header" v-bind:close="onClose" v-bind:screenFilteredTaskData="formData" v-bind:taskReady="taskReady">
@@ -168,7 +168,7 @@
168168
</div>
169169
<div
170170
id="reassign-container"
171-
class="d-flex mb-3"
171+
class="d-flex align-items-center overlay-div position-absolute top-0 start-0 w-100 bg-white shadow-lg p-2 pr-4"
172172
v-if="showReassignment"
173173
>
174174
<div class="mr-3">
@@ -209,10 +209,10 @@
209209
</template>
210210
</select-from-api>
211211
</div>
212-
<button type="button" class="btn btn-secondary ml-2" @click="reassignUser" :disabled="disabled">
212+
<button type="button" class="btn btn-primary btn-sm ml-2" @click="reassignUser" :disabled="disabled">
213213
{{ $t('Assign') }}
214214
</button>
215-
<button type="button" class="btn btn-outline-secondary ml-2" @click="cancelReassign">
215+
<button type="button" class="btn btn-outline-secondary btn-sm ml-2" @click="cancelReassign">
216216
{{ $t('Cancel') }}
217217
</button>
218218
</div>
@@ -221,8 +221,7 @@
221221
'frame-container-full': tooltipButton === 'fullTask',
222222
'frame-container-inbox': tooltipButton === 'inboxRules'
223223
}"
224-
class="iframe-container"
225-
v-show="!showReassignment">
224+
class="iframe-container">
226225
<iframe
227226
v-if="showFrame1"
228227
:title="$t('Preview')"

0 commit comments

Comments
 (0)