Skip to content

feature/FOUR-18099 STORY Tasks from Processes I manage section #7435

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.

Sign up for GitHub

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

Merged
nolanpro merged 1 commit into from
Oct 1, 2024
Merged

feature/FOUR-18099 STORY Tasks from Processes I manage section #7435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion resources/js/tasks/components/TasksList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,10 @@ export default {
type: String,
default: "tasks",
},
verifyUrlToFalse: {
type: Boolean,
default: false
}
},
data() {
return {
Expand Down Expand Up @@ -846,7 +850,10 @@ export default {
},
verifyURL(string) {
const currentUrl = window.location.href;
const isInUrl = currentUrl.includes(string);
let isInUrl = currentUrl.includes(string);
if (this.verifyUrlToFalse) {
isInUrl = false;
}
return isInUrl;
},
/**
Expand Down
11 changes: 5 additions & 6 deletions resources/js/tasks/components/TasksPreview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<splitpane-container v-if="showPreview" :size="splitpaneSize">
<div
ref="tasks-preview"
class="tasks-preview h-100 p-3"
class="tasks-preview h-100 p-3 position-relative"
>
<div class="d-flex w-100 mb-3">
<slot name="header" v-bind:close="onClose" v-bind:screenFilteredTaskData="formData" v-bind:taskReady="taskReady">
Expand Down Expand Up @@ -168,7 +168,7 @@
</div>
<div
id="reassign-container"
class="d-flex mb-3"
class="d-flex align-items-center overlay-div position-absolute top-0 start-0 w-100 bg-white shadow-lg p-2 pr-4"
v-if="showReassignment"
>
<div class="mr-3">
Expand Down Expand Up @@ -209,10 +209,10 @@
</template>
</select-from-api>
</div>
<button type="button" class="btn btn-secondary ml-2" @click="reassignUser" :disabled="disabled">
<button type="button" class="btn btn-primary btn-sm ml-2" @click="reassignUser" :disabled="disabled">
{{ $t('Assign') }}
</button>
<button type="button" class="btn btn-outline-secondary ml-2" @click="cancelReassign">
<button type="button" class="btn btn-outline-secondary btn-sm ml-2" @click="cancelReassign">
{{ $t('Cancel') }}
</button>
</div>
Expand All @@ -221,8 +221,7 @@
'frame-container-full': tooltipButton === 'fullTask',
'frame-container-inbox': tooltipButton === 'inboxRules'
}"
class="iframe-container"
v-show="!showReassignment">
class="iframe-container">
<iframe
v-if="showFrame1"
:title="$t('Preview')"
Expand Down