Merge branch 'bugfix/PMCORE-3018' of https://bitbucket.org/colosa/processmaker into bugfix/PMCORE-3018

workflow/engine/classes/WorkspaceTools.php

@@ -358,10 +358,7 @@ class WorkspaceTools
         $this->upgradeSchema($systemSchema);
         CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");
 
-        CLI::logging("* Start migrating to new list tables...\n");
-        $start = microtime(true);
-        $this->migrateList(true, $lang);
-        CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+        // The list tables was deprecated, the migration is not required
 
         CLI::logging("* Start updating MySQL triggers...\n");
         $start = microtime(true);
@@ -2234,10 +2231,7 @@ class WorkspaceTools
                 $workspace->upgradeSchema($systemSchema);
                 CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");
 
-                CLI::logging("* Start migrating to new list tables...\n");
-                $start = microtime(true);
-                $workspace->migrateList(true, $lang);
-                CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+                // The list tables was deprecated, the migration is not required
 
                 CLI::logging("* Start updating MySQL triggers...\n");
                 $start = microtime(true);
@@ -2558,6 +2552,7 @@ class WorkspaceTools
      * @see \WorkspaceTools->restore
      * @see workflow/engine/bin/tasks/cliWorkspaces.php:migrate_new_cases_lists()
      * @link https://wiki.processmaker.com/3.3/processmaker_command#migrate-new-cases-lists
+     * @deprecated Class deprecated in Release 3.6.x
      */
     public function migrateList($flagReinsert = false, $lang = 'en')
     {

workflow/engine/content/translations/english/processmaker.en.po

@@ -4262,8 +4262,14 @@ msgstr "The Case {APP_NUMBER} was unpaused successfully!"
 # TRANSLATION
 # LABEL/ID_CASE_USER_INVALID_CANCEL_CASE
 #: LABEL/ID_CASE_USER_INVALID_CANCEL_CASE
-msgid "The user with \"{0}\" is invalid to cancel the Case."
-msgstr "The user with \"{0}\" is invalid to cancel the Case."
+msgid "The user with \"{0}\" is invalid to cancel the case."
+msgstr "The user with \"{0}\" is invalid to cancel the case."
+
+# TRANSLATION
+# LABEL/ID_CASE_USER_INVALID_CLAIM_CASE
+#: LABEL/ID_CASE_USER_INVALID_CLAIM_CASE
+msgid "The user with \"{0}\" is invalid to claim the case."
+msgstr "The user with \"{0}\" is invalid to claim the case."
 
 # TRANSLATION
 # LABEL/ID_CASE_USER_INVALID_PAUSED_CASE
@@ -4274,8 +4280,8 @@ msgstr "The user with \"{0}\" is invalid to pause the case."
 # TRANSLATION
 # LABEL/ID_CASE_USER_INVALID_UNPAUSE_CASE
 #: LABEL/ID_CASE_USER_INVALID_UNPAUSE_CASE
-msgid "The user with \"{0}\" is invalid to Unpause the Case."
-msgstr "The user with \"{0}\" is invalid to Unpause the Case."
+msgid "The user with \"{0}\" is invalid to Unpause the case."
+msgstr "The user with \"{0}\" is invalid to Unpause the case."
 
 # TRANSLATION
 # LABEL/ID_CASE_USER_NOT_HAVE_PERMISSION

workflow/engine/data/mysql/insert.sql

@@ -57521,9 +57521,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_CASE_TRACKER_OBJECT_DOES_NOT_EXIST','en','The case tracker object with {0}: {1} does not exist.','2014-05-20') ,
 ( 'LABEL','ID_CASE_UNARHIVE','en','Case Unarhive','2015-09-15') ,
 ( 'LABEL','ID_CASE_UNPAUSED_SUCCESSFULLY','en','The Case {APP_NUMBER} was unpaused successfully!','2014-01-15') ,
-( 'LABEL','ID_CASE_USER_INVALID_CANCEL_CASE','en','The user with "{0}" is invalid to cancel the Case.','2015-08-24') ,
+( 'LABEL','ID_CASE_USER_INVALID_CANCEL_CASE','en','The user with "{0}" is invalid to cancel the case.','2015-08-24') ,
+( 'LABEL','ID_CASE_USER_INVALID_CLAIM_CASE','en','The user with "{0}" is invalid to claim the case.','2021-05-212') ,
 ( 'LABEL','ID_CASE_USER_INVALID_PAUSED_CASE','en','The user with "{0}" is invalid to pause the case.','2015-08-14') ,
-( 'LABEL','ID_CASE_USER_INVALID_UNPAUSE_CASE','en','The user with "{0}" is invalid to Unpause the Case.','2015-08-14') ,
+( 'LABEL','ID_CASE_USER_INVALID_UNPAUSE_CASE','en','The user with "{0}" is invalid to Unpause the case.','2015-08-14') ,
 ( 'LABEL','ID_CASE_USER_NOT_HAVE_PERMISSION','en','The user with "{0}" did not have permission to perform this action.','2015-09-01') ,
 ( 'LABEL','ID_CASE_VARIABLE_ALREADY_EXISTS','en','The Variable with {0}: "{1}" already exists in Case','2016-02-23') ,
 ( 'LABEL','ID_CASE_VARIABLE_DOES_NOT_EXIST','en','The Variable with {0}: "{1}" does not exist in Case','2016-02-23') ,

workflow/engine/data/mysql/schema.sql

@@ -151,7 +151,8 @@ DROP TABLE IF EXISTS `APP_MESSAGE`;
 
 CREATE TABLE `APP_MESSAGE`
 (
-	`APP_MSG_UID` VARCHAR(32)  NOT NULL,
+	`APP_MSG_ID` INTEGER  NOT NULL AUTO_INCREMENT,
+    `APP_MSG_UID` VARCHAR(32)  NOT NULL,
 	`MSG_UID` VARCHAR(32),
 	`APP_UID` VARCHAR(32) default '' NOT NULL,
 	`DEL_INDEX` INTEGER default 0 NOT NULL,
@@ -175,14 +176,16 @@ CREATE TABLE `APP_MESSAGE`
 	`TAS_ID` INTEGER default 0,
 	`APP_NUMBER` INTEGER default 0,
 	PRIMARY KEY (`APP_MSG_UID`),
+    UNIQUE KEY `indexAppMsgId` (`APP_MSG_ID`),
 	KEY `indexForAppUid`(`APP_UID`),
 	KEY `indexForMsgStatus`(`APP_MSG_STATUS`),
 	KEY `INDEX_PRO_ID`(`PRO_ID`),
 	KEY `INDEX_TAS_ID`(`TAS_ID`),
 	KEY `INDEX_APP_NUMBER`(`APP_NUMBER`),
-	KEY `INDEX_APP_MSG_TYPE_ID`(`APP_MSG_STATUS_ID`),
+	KEY `INDEX_APP_MSG_TYPE_ID`(`APP_MSG_TYPE_ID`),
 	KEY `INDEX_APP_MSG_STATUS_ID`(`APP_MSG_STATUS_ID`),
-	KEY `indexAppUidSendDate`(`APP_UID`, `APP_MSG_SEND_DATE`)
+	KEY `indexAppUidSendDate`(`APP_UID`, `APP_MSG_SEND_DATE`),
+    KEY `indexAppMsgDate`(`APP_MSG_DATE`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
 #-----------------------------------------------------------------------------
 #-- APP_OWNER