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

I corrected some observations

Browse Source
This commit is contained in:
Paula V. Quispe
2015-03-02 14:27:34 -04:00
parent 6ede532d79
commit dc7b91f1f5
5 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/model/ListInbox.php
View File

@@ -81,18 +81,6 @@ class ListInbox extends BaseListInbox
// update participated history // update participated history
$listParticipatedHistory = new ListParticipatedHistory(); $listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->update($data); $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);
}
}*/
return $result; return $result;
} else { } else {
$con->rollback(); $con->rollback();

2
workflow/engine/data/mysql/schema.sql
View File

@@ -2213,7 +2213,7 @@ CREATE TABLE `LIST_INBOX`
`DEL_DUE_DATE` DATETIME, `DEL_DUE_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`), 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'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- LIST_PARTICIPATED_HISTORY #-- LIST_PARTICIPATED_HISTORY

10
workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
View File

@@ -30,19 +30,9 @@ class Lists {
$userUid = $dataList["userId"]; $userUid = $dataList["userId"];
$filters["paged"] = isset( $dataList["paged"] ) ? $dataList["paged"] : true; $filters["paged"] = isset( $dataList["paged"] ) ? $dataList["paged"] : true;
$filters['count'] = isset( $dataList['count'] ) ? $dataList['count'] : true; $filters['count'] = isset( $dataList['count'] ) ? $dataList['count'] : true;
$filters["category"] = isset( $dataList["category"] ) ? $dataList["category"] : ""; $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"] : ""; $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"] : ""; $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["filter"] = isset( $dataList["filter"] ) ? $dataList["filter"] : "";
$filters["dateFrom"] = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : ""; $filters["dateFrom"] = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : "";
$filters["dateTo"] = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : ""; $filters["dateTo"] = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : "";

8
workflow/engine/templates/cases/casesList.js
View File

@@ -2272,14 +2272,6 @@ var gridForm = new Ext.FormPanel({
} }
comboAllUsers.setValue("CURRENT_USER"); comboAllUsers.setValue("CURRENT_USER");
// hidding the buttons for the reassign
// if (action=='to_reassign'){
// btnSelectAll.hide();
// btnUnSelectAll.hide();
// btnReassign.hide();
// }
function reassign(){ function reassign(){
storeReassignCases.removeAll(); storeReassignCases.removeAll();
var rows = grid.getSelectionModel().getSelections(); var rows = grid.getSelectionModel().getSelections();