From 941843b7679b0c3d5b032893f79f67f94097b353 Mon Sep 17 00:00:00 2001 From: jennylee Date: Thu, 16 Oct 2014 09:51:04 -0400 Subject: [PATCH 1/2] PM-605 Deleting the Creation of RT old Version. & Fixing the paginator in RT List --- workflow/engine/controllers/pmTablesProxy.php | 29 ++++++------ workflow/engine/templates/pmTables/list.js | 46 ++++++++++++------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 2641d8334..08ea8d623 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -51,21 +51,20 @@ class pmTablesProxy extends HttpProxyController while ($oDataset->next()) { $reportTablesOldList[] = $oDataset->getRow(); } - $addTables['count'] += count( $reportTablesOldList ); - - if(($start+$limit) > $addTables['count']){ - foreach ($reportTablesOldList as $i => $oldRepTab) { - if($filter != ''){ - $oldTableName = strtolower($oldRepTab['REP_TAB_NAME']); - $oldTableDesc = strtolower($oldRepTab['REP_TAB_TITLE']); - if((strpos($oldTableName, $filter) !== false) || (strpos($oldTableDesc, $filter) !== false)){ - $addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' ); - } - } else { - $addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' ); - } - } - } + foreach ($reportTablesOldList as $i => $oldRepTab) { + if($filter != ''){ + if((stripos($oldRepTab['REP_TAB_NAME'], $filter) !== false) || (stripos($oldRepTab['REP_TAB_TITLE'], $filter) !== false)){ + $addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' ); + } + } else { + $addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' ); + } + } + $addTables['count'] = count($addTables['rows']); + if($start != 0){ + $addTables['rows'] = array_splice($addTables['rows'], $start); + } + $addTables['rows'] = array_splice($addTables['rows'], 0, $limit); } else { $addTables = AdditionalTables::getAll( $start, $limit, $filter ); } diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js index 9a46f9329..8cf02f4d4 100755 --- a/workflow/engine/templates/pmTables/list.js +++ b/workflow/engine/templates/pmTables/list.js @@ -40,33 +40,43 @@ Ext.onReady(function(){ pageSize = parseInt(CONFIG.pageSize); - var newMenuOptions = new Array(); if (PRO_UID == false) { + var newMenuOptions = new Array(); + newMenuOptions.push({ - text: _('ID_NEW_PMTABLE'), - handler: newPMTable + text: _('ID_NEW_PMTABLE'), + handler: newPMTable }); + newMenuOptions.push({ + text: _('ID_NEW_REPORT_TABLE'), + handler: NewReportTable + }); + + newButton = new Ext.Action({ + id: 'newButton', + text: _('ID_NEW'), + icon: '/images/add-table.png', + menu: newMenuOptions + }); } + var flagProcessmap = (typeof('flagProcessmap') != 'undefined') ? flagProcessmap : 0; - newMenuOptions.push({ - text: _('ID_NEW_REPORT_TABLE'), - handler: NewReportTable - }); - - if (PRO_UID !== false) { + /*if (PRO_UID !== false) { newMenuOptions.push({ text: _('ID_NEW_REPORT_TABLE_OLD'), handler: NewReportTableOld }); - } + }*/ - newButton = new Ext.Action({ - id: 'newButton', - text: _('ID_NEW'), - icon: '/images/add-table.png', - menu: newMenuOptions - }); + if (PRO_UID !== false) { + newButton = new Ext.Action({ + id: 'newButton', + text: _('ID_NEW'), + icon: '/images/add-table.png', + handler: NewReportTable + }); + } editButton = new Ext.Action({ id: 'editButton', @@ -705,12 +715,14 @@ UpdatePageConfig = function(pageSize){ //Do Search Function DoSearch = function(){ - infoGrid.store.load({params: {textFilter: searchText.getValue()}}); + infoGrid.store.setBaseParam('textFilter', searchText.getValue()); + infoGrid.store.load(); }; //Load Grid By Default GridByDefault = function(){ searchText.reset(); + infoGrid.store.setBaseParam('textFilter', searchText.getValue()); infoGrid.store.load(); }; From bb39e966df633999520595781f9907e557e475dd Mon Sep 17 00:00:00 2001 From: jennylee Date: Thu, 16 Oct 2014 09:58:35 -0400 Subject: [PATCH 2/2] Deleting the Creation of RT old Version. & Fixing the paginator in RT List --- workflow/engine/controllers/pmTablesProxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 08ea8d623..e3a1431db 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -42,7 +42,7 @@ class pmTablesProxy extends HttpProxyController if ($pro_uid !== null) { $process = $pro_uid == '' ? array ('not_equal' => $pro_uid ) : array ('equal' => $pro_uid); - $addTables = AdditionalTables::getAll( $start, $limit, $filter, $process ); + $addTables = AdditionalTables::getAll( false, false, $filter, $process ); $c = $processMap->getReportTablesCriteria( $pro_uid ); $oDataset = RoutePeer::doSelectRS( $c );