Merged in release/3.8.1 (pull request #8684)

release/3.8.1

resources/assets/js/api/Cases.js

@@ -313,7 +313,7 @@ export let cases = {
         return Api.update({
             service: "ASSIGN_CASE",
             data: {
-                reason: data.reasonReassign,
+                reason: data.reasonAssign,
                 sendMail: data.notifyUser,
                 index: data.DEL_INDEX
             },

resources/assets/js/home/Home.vue

@@ -41,6 +41,7 @@
                 @onRemoveFilter="onRemoveFilter"
                 @onUpdatePage="onUpdatePage"
                 @onUpdateDataCase="onUpdateDataCase"
+                @onOpenCaseDetail="onOpenCaseDetail"
                 @onLastPage="onLastPage"
                 @onUpdateFilters="onUpdateFilters"
                 @cleanDefaultOption="cleanDefaultOption"
@@ -95,6 +96,7 @@ export default {
             page: null,
             menu: [],
             dataCase: {},
+            selectedItem: {},
             hideToggle: true,
             collapsed: false,
             selectedTheme: "",
@@ -193,7 +195,16 @@ export default {
                     that.OnClickSidebarItem(that.getItemMenuByValue("page","inbox"));
                 }
                 if ( e.data === "redirect=MyCases" || e.message === "redirect=MyCases"){
-                    that.OnClickSidebarItem(that.getItemMenuByValue("page","MyCases"));
+                    that.onUpdateDataCase({
+                        APP_UID: that.selectedItem.APP_UID,
+                        DEL_INDEX: that.selectedItem.DEL_INDEX,
+                        PRO_UID: that.selectedItem.PRO_UID,
+                        TAS_UID: that.selectedItem.TAS_UID,
+                        APP_NUMBER: that.selectedItem.CASE_NUMBER,
+                        FLAG: "SUPERVISING",
+                        ACTION:"to_revise"
+                    });
+                    that.onUpdatePage("case-detail");
                 }
                 if ( e.data === "update=debugger" || e.message === "update=debugger"){
                     if(that.$refs["component"].updateView){
@@ -564,6 +575,9 @@ export default {
         onUpdateDataCase(data) {
             this.dataCase = data;
         },
+        onOpenCaseDetail(item){
+            this.selectedItem = item;
+        },
         onLastPage() {
             this.page = this.lastPage;
             this.lastPage = "MyCases";

resources/assets/js/home/MyCases/MyCases.vue

@@ -348,6 +348,7 @@ export default {
          */
         openCaseDetail(item) {
             let that = this;
+            that.$emit("onOpenCaseDetail", item);
             api.cases.open(_.extend({ ACTION: "todo" }, item)).then(() => {
                 api.cases
                     .cases_open(_.extend({ ACTION: "todo" }, item))

resources/assets/js/home/modal/ModalAssignCase.vue

@@ -107,6 +107,9 @@ export default {
      */
     show() {
       this.users = [];
+      this.reasonReassign = null;
+      this.userSelected = null;
+      this.notifyUser = false;
       this.getUsers();
       this.$refs["modal-assign-case"].show();
     },

resources/assets/js/home/modal/ModalReassignCase.vue

@@ -108,6 +108,9 @@ export default {
      */
     show() {
       this.users = [];
+      this.reasonReassign = null;
+      this.userSelected = null;
+      this.notifyUser = false;
       this.getUsersReassign();
       this.$refs["modal-reassign-case"].show();
       if (this.data.FLAG){

workflow/engine/methods/cases/casesListExtJsRedirector.php

@@ -30,15 +30,7 @@ if (isset($_GET['ux'])) {
 if (isset($_GET['ux'])) {
     echo 'if (typeof window.parent.ux_env != \'undefined\') {';
 }
-/*----------------------------------********---------------------------------*/
+echo '  parent.parent.postMessage("redirect=todo","*");';
-if (true) {
-    echo '  parent.parent.postMessage("redirect=todo","*");';
-} else {
-/*----------------------------------********---------------------------------*/
-    echo "  window.parent.location.href = '$url';";
-/*----------------------------------********---------------------------------*/
-}
-/*----------------------------------********---------------------------------*/
 if (isset($_GET['ux'])) {
     /*----------------------------------********---------------------------------*/
     if (PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && $statusPMGmail) {