fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-3442 (pull request #8235)

Browse Source 
PMCORE-3442

Approved-by: Rodrigo Quelca
This commit is contained in:
Fabio Guachalla
2021-10-25 15:08:12 +00:00
committed by Julio Cesar Laura Avendaño
parent 9242c78268 7e77ecb5a2
commit 1d0e21e71f
8 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/js/home/CustomCaseList/CustomCaseList.vue
View File

@@ -658,9 +658,8 @@ export default {
DEL_INDEX: params.del_index, DEL_INDEX: params.del_index,
}); });
this.$emit("cleanDefaultOption"); this.$emit("cleanDefaultOption");
} } else if (params && params.openapplicationuid) {
//force to search in the parallel tasks //force to search in the parallel tasks
if (params && params.openapplicationuid) {
this.onUpdateFilters({ this.onUpdateFilters({
params: [ params: [
{ {

5
resources/assets/js/home/Draft/Draft.vue
View File

@@ -426,9 +426,8 @@ export default {
DEL_INDEX: params.del_index DEL_INDEX: params.del_index
}); });
this.$emit("cleanDefaultOption"); this.$emit("cleanDefaultOption");
} } else if (params && params.openapplicationuid) {
//force to search in the parallel tasks //force to search in the parallel tasks
if (params && params.openapplicationuid) {
this.onUpdateFilters({ this.onUpdateFilters({
params: [ params: [
{ {

9
resources/assets/js/home/Home.vue
View File

@@ -65,7 +65,7 @@ import TaskReassignments from "./TaskReassignments";
import AdvancedSearch from "./AdvancedSearch/AdvancedSearch.vue"; import AdvancedSearch from "./AdvancedSearch/AdvancedSearch.vue";
import LegacyFrame from "./LegacyFrame"; import LegacyFrame from "./LegacyFrame";
import CustomCaseList from "./CustomCaseList/CustomCaseList.vue" import CustomCaseList from "./CustomCaseList/CustomCaseList.vue"
import utils from "../utils/utils"
import api from "./../api/index"; import api from "./../api/index";
import eventBus from './EventBus/eventBus' import eventBus from './EventBus/eventBus'
import _ from "lodash"; import _ from "lodash";
@@ -286,7 +286,8 @@ export default {
* Set default cases menu option * Set default cases menu option
*/ */
setDefaultCasesMenu(data) { setDefaultCasesMenu(data) {
let menuItem = _.find(data, function(o) { let params,
menuItem = _.find(data, function(o) {
return o.id === window.config._nodeId; return o.id === window.config._nodeId;
}); });
if (menuItem && menuItem.href) { if (menuItem && menuItem.href) {
@@ -295,8 +296,8 @@ export default {
} else { } else {
this.page = "MyCases"; this.page = "MyCases";
} }
if (window.config._nodeId === "CASES_SENT" && this.defaultOption.indexOf('openApplicationUid') > 0) { params = utils.getAllUrlParams(this.defaultOption);
this.cleanDefaultOption(); if (params.action === 'mycases' && params.filter === '') {
this.showAlert(this.$i18n.t("ID_NO_PERMISSION_NO_PARTICIPATED_CASES")); this.showAlert(this.$i18n.t("ID_NO_PERMISSION_NO_PARTICIPATED_CASES"));
} }
this.settings = this.config.setting[this.page]; this.settings = this.config.setting[this.page];

5
resources/assets/js/home/Inbox/Inbox.vue
View File

@@ -461,9 +461,8 @@ export default {
DEL_INDEX: params.del_index, DEL_INDEX: params.del_index,
}); });
this.$emit("cleanDefaultOption"); this.$emit("cleanDefaultOption");
} } else if (params && params.openapplicationuid) {
//force to search in the parallel tasks //force to search in the parallel tasks
if (params && params.openapplicationuid) {
this.onUpdateFilters({ this.onUpdateFilters({
params: [ params: [
{ {

29
resources/assets/js/home/MyCases/MyCases.vue
View File

@@ -273,10 +273,19 @@ export default {
let params; let params;
if (this.defaultOption) { if (this.defaultOption) {
params = utils.getAllUrlParams(this.defaultOption); params = utils.getAllUrlParams(this.defaultOption);
if (params && params.app_uid && params.del_index) { if (params && params.openapplicationuid) {
this.openCase({ this.onUpdateFilters({
APP_UID: params.app_uid, params: [
DEL_INDEX: params.del_index, {
fieldId: "caseNumber",
filterVar: "caseNumber",
label: "",
options: [],
value: params.openapplicationuid,
autoShow: false,
},
],
refresh: false,
}); });
this.$emit("cleanDefaultOption"); this.$emit("cleanDefaultOption");
} }
@@ -360,10 +369,20 @@ export default {
let header = window.config._nodeId, let header = window.config._nodeId,
filters = this.headers, filters = this.headers,
filter, filter,
i; i,
params;
if (header === "CASES_TO_REVISE") { if (header === "CASES_TO_REVISE") {
filter = "SUPERVISING"; filter = "SUPERVISING";
} }
params = utils.getAllUrlParams(window.config.defaultOption);
if (params.action === 'mycases' && params.filter !== '') {
if (params.filter === 'inprogress') {
filter = 'IN_PROGRESS'
}
if (params.filter === 'completed') {
filter = 'COMPLETED'
}
}
for (i = 0; i < filters.length; i += 1) { for (i = 0; i < filters.length; i += 1) {
if (filters[i].item === filter) { if (filters[i].item === filter) {
filters[i].onClick(filters[i]); filters[i].onClick(filters[i]);

5
resources/assets/js/home/Paused/Paused.vue
View File

@@ -460,9 +460,8 @@ export default {
DEL_INDEX: params.del_index DEL_INDEX: params.del_index
}); });
this.$emit("cleanDefaultOption"); this.$emit("cleanDefaultOption");
} } else if (params && params.openapplicationuid) {
//force to search in the parallel tasks //force to search in the parallel tasks
if (params && params.openapplicationuid) {
this.onUpdateFilters({ this.onUpdateFilters({
params: [ params: [
{ {

2
resources/assets/js/home/XCase.vue
View File

@@ -58,7 +58,7 @@ export default {
setTimeout(() => { setTimeout(() => {
let that = this; let that = this;
if (this.dataCase.APP_UID) { if (this.dataCase.APP_UID && this.dataCase.PRO_UID) {
api.cases.debugStatus(this.dataCase) api.cases.debugStatus(this.dataCase)
.then((response) => { .then((response) => {
if (response.data) { if (response.data) {

1
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -2473,7 +2473,6 @@ class Cases
'DEL_INDEX' => [], 'DEL_INDEX' => [],
'PRO_UID' => $record['PRO_UID'] 'PRO_UID' => $record['PRO_UID']
]; ];
$arrayData['DEL_INDEX'][] = $record['DEL_INDEX'];
foreach ($result as $record) { foreach ($result as $record) {
$arrayData['DEL_INDEX'][] = $record['DEL_INDEX']; $arrayData['DEL_INDEX'][] = $record['DEL_INDEX'];
} }