diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index 9d5f3511c..403c9a7f6 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -80,19 +80,7 @@ class ListInbox extends BaseListInbox // update participated history $listParticipatedHistory = new ListParticipatedHistory(); - $listParticipatedHistory->update($data); - //$listParticipatedLast = new ListParticipatedLast(); - //$listParticipatedLast->update($data); - /*if(isset($data['APP_UID']) && isset($data['DEL_INDEX'])){ - $oRow = ListInboxPeer::retrieveByPK( $data['APP_UID'], $data['DEL_INDEX'] ); - if(is_object($oRow)){ - $newData = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); - - // update participated last - $listParticipatedLast = new ListParticipatedLast(); - $listParticipatedLast->update($newData); - } - }*/ + $listParticipatedHistory->update($data); return $result; } else { $con->rollback(); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 503936358..012edebf3 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -4030,7 +4030,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 70fa9078c..9066d054f 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -2213,7 +2213,7 @@ CREATE TABLE `LIST_INBOX` `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), - KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`) + KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list'; #----------------------------------------------------------------------------- #-- LIST_PARTICIPATED_HISTORY diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php index 83524f067..0c70c0e1d 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php @@ -30,19 +30,9 @@ class Lists { $userUid = $dataList["userId"]; $filters["paged"] = isset( $dataList["paged"] ) ? $dataList["paged"] : true; $filters['count'] = isset( $dataList['count'] ) ? $dataList['count'] : true; - $filters["category"] = isset( $dataList["category"] ) ? $dataList["category"] : ""; - if(empty($filters["category"]) && isset($_GET['category'])){ - $filters["category"] = $_GET['category']; - } $filters["process"] = isset( $dataList["process"] ) ? $dataList["process"] : ""; - if(empty($filters["process"]) && isset($_GET['process'])){ - $filters["process"] = $_GET['process']; - } $filters["search"] = isset( $dataList["search"] ) ? $dataList["search"] : ""; - if(empty($filters["search"]) && isset($_GET['search'])){ - $filters["category"] = $_GET['search']; - } $filters["filter"] = isset( $dataList["filter"] ) ? $dataList["filter"] : ""; $filters["dateFrom"] = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : ""; $filters["dateTo"] = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : ""; diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 25feb8ee3..59f73908b 100755 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -2272,14 +2272,6 @@ var gridForm = new Ext.FormPanel({ } comboAllUsers.setValue("CURRENT_USER"); -// hidding the buttons for the reassign -// if (action=='to_reassign'){ -// btnSelectAll.hide(); -// btnUnSelectAll.hide(); -// btnReassign.hide(); -// } - - function reassign(){ storeReassignCases.removeAll(); var rows = grid.getSelectionModel().getSelections();