fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1078 from victorsl/BUG-10131

Browse Source 
BUG 10131 "Don't showing the summary and cases notes columns" SOLVED
This commit is contained in:
julceslauhub
2012-12-11 07:41:56 -08:00
parent 75f9b44d5d bef44bcfbd
commit b5ff0b6712
9 changed files with 533 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
workflow/engine/bin/tasks/libraries.json
View File

@@ -187,6 +187,55 @@
"build" : true,
"build_js_to" : "gulliver/js/maborak/core/"
},
{
"name": "ext-all",
"libraries": [
{
"name": "ext-all",
"full": "gulliver/js/ext/ext-all.js",
"mini": "gulliver/js/ext/ext-all.js",
"minify": true
},
{
"name": "ux-all",
"full": "gulliver/js/ext/ux/ux-all.js",
"mini": "gulliver/js/ext/ux/ux-all.js",
"minify": true
},
{
"name": "pmos-common",
"full": "gulliver/js/ext/pmos-common.js",
"mini": "gulliver/js/ext/pmos-common.js",
"minify": true
},
{
"name": "miframe",
"full": "gulliver/js/ext/ux/miframe.js",
"mini": "gulliver/js/ext/ux/miframe.js",
"minify": true
},
{
"name": "Ext.ux.LocationBar",
"full": "gulliver/js/ext/ux.locationbar/Ext.ux.LocationBar.js",
"mini": "gulliver/js/ext/ux.locationbar/Ext.ux.LocationBar.js",
"minify": true
},
{
"name": "ext-statusbar",
"full": "gulliver/js/ext/ux.statusbar/ext-statusbar.js",
"mini": "gulliver/js/ext/ux.statusbar/ext-statusbar.js",
"minify": true
},
{
"name": "Ext.ux.tree.TreeFilterX",
"full": "gulliver/js/ext/ux.treefilterx/Ext.ux.tree.TreeFilterX.js",
"mini": "gulliver/js/ext/ux.treefilterx/Ext.ux.tree.TreeFilterX.js",
"minify": true
}
],
"build" : true,
"build_js_to" : "gulliver/js/ext/min/"
},
{
"name": "draw2d",
"libraries": [

57
workflow/engine/classes/class.applications.php
View File

@@ -47,7 +47,7 @@ class Applications
//get data configuration
$conf = new Configurations();
$confCasesList = $conf->getConfiguration( 'casesList', ($action == 'search' || $action == 'simple_search') ? 'sent' : $action );
$confCasesList = $conf->getConfiguration("casesList", ($action == "search" || $action == "simple_search")? "search" : $action);
$oAppCache->confCasesList = $confCasesList;
// get the action based list
@@ -240,28 +240,49 @@ class Applications
}
}
//add the search filter
//Add the search filter
if ($search != '') {
$defaultFields = $oAppCache->getDefaultFields();
$oTmpCriteria = '';
// if there is PMTABLE for this case list:
if (! empty( $oAppCache->confCasesList ) && isset( $oAppCache->confCasesList['PMTable'] ) && trim( $oAppCache->confCasesList['PMTable'] ) != '') {
// getting the table name
$oAdditionalTables = AdditionalTablesPeer::retrieveByPK( $oAppCache->confCasesList['PMTable'] );
$tableName = $oAdditionalTables->getAddTabName();
$oNewCriteria = new Criteria( 'workflow' );
$counter = 0;
foreach ($oAppCache->confCasesList['second']['data'] as $fieldData) {
if (! in_array( $fieldData['name'], $defaultFields )) {
$fieldName = $tableName . '.' . $fieldData['name'];
if ($counter == 0) {
$oTmpCriteria = $oNewCriteria->getNewCriterion( $fieldName, '%' . $search . '%', Criteria::LIKE );
} else {
$oTmpCriteria = $oNewCriteria->getNewCriterion( $fieldName, '%' . $search . '%', Criteria::LIKE )->addOr( $oTmpCriteria );
//If there is PMTable for this case list
if (is_array($oAppCache->confCasesList) && count($oAppCache->confCasesList) > 0 && isset($oAppCache->confCasesList["PMTable"]) && trim($oAppCache->confCasesList["PMTable"]) != "") {
//Default configuration fields array
$defaultFields = $oAppCache->getDefaultFields();
//Getting the table name
$additionalTableUid = $oAppCache->confCasesList["PMTable"];
$additionalTable = AdditionalTablesPeer::retrieveByPK($additionalTableUid);
$tableName = $additionalTable->getAddTabName();
$additionalTable = new AdditionalTables();
$tableData = $additionalTable->load($additionalTableUid, true);
$tableField = array();
foreach ($tableData["FIELDS"] as $arrayField) {
$tableField[] = $arrayField["FLD_NAME"];
}
$oNewCriteria = new Criteria("workflow");
$sw = 0;
foreach ($oAppCache->confCasesList["second"]["data"] as $fieldData) {
if (!in_array($fieldData["name"], $defaultFields)) {
if (in_array($fieldData["name"], $tableField)) {
$fieldName = $tableName . "." . $fieldData["name"];
if ($sw == 0) {
$oTmpCriteria = $oNewCriteria->getNewCriterion($fieldName, "%" . $search . "%", Criteria::LIKE);
} else {
$oTmpCriteria = $oNewCriteria->getNewCriterion($fieldName, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria);
}
$sw = 1;
}
$counter ++;
}
}
//add the default and hidden DEL_INIT_DATE
}

329
workflow/engine/classes/class.configuration.php
View File

File diff suppressed because it is too large Load Diff

86
workflow/engine/classes/model/AppCacheView.php
View File

@@ -825,37 +825,47 @@ class AppCacheView extends BaseAppCacheView
$oCriteria = new Criteria('workflow');
$oCriteria->clearSelectColumns();
//default configuration fields array
//Default configuration fields array
$defaultFields = $this->getDefaultFields();
//if there is PMTABLE for this case list:
if (!empty($this->confCasesList) &&
isset($this->confCasesList['PMTable']) &&
trim($this->confCasesList['PMTable']) != ''
) {
//getting the table name
$oAdditionalTables = AdditionalTablesPeer::retrieveByPK($this->confCasesList['PMTable']);
$tableName = $oAdditionalTables->getAddTabName();
//If there is PMTable for this case list
if (is_array($this->confCasesList) && count($this->confCasesList) > 0 && isset($this->confCasesList["PMTable"]) && trim($this->confCasesList["PMTable"]) != "") {
//Getting the table name
$additionalTableUid = $this->confCasesList["PMTable"];
foreach ($this->confCasesList['second']['data'] as $fieldData) {
if (!in_array($fieldData['name'],$defaultFields)) {
$fieldName = $tableName . '.' . $fieldData['name'];
$oCriteria->addSelectColumn($fieldName);
} else {
switch ($fieldData['fieldType']) {
case 'case field':
$configTable = 'APP_CACHE_VIEW';
$additionalTable = AdditionalTablesPeer::retrieveByPK($additionalTableUid);
$tableName = $additionalTable->getAddTabName();
$additionalTable = new AdditionalTables();
$tableData = $additionalTable->load($additionalTableUid, true);
$tableField = array();
foreach ($tableData["FIELDS"] as $arrayField) {
$tableField[] = $arrayField["FLD_NAME"];
}
foreach ($this->confCasesList["second"]["data"] as $fieldData) {
if (in_array($fieldData["name"], $defaultFields)) {
switch ($fieldData["fieldType"]) {
case "case field":
$configTable = "APP_CACHE_VIEW";
break;
case 'delay field':
$configTable = 'APP_DELAY';
case "delay field":
$configTable = "APP_DELAY";
break;
default:
$configTable = 'APP_CACHE_VIEW';
$configTable = "APP_CACHE_VIEW";
break;
}
$fieldName = $configTable . '.' . $fieldData['name'];
$fieldName = $configTable . "." . $fieldData["name"];
$oCriteria->addSelectColumn($fieldName);
} else {
if (in_array($fieldData["name"], $tableField)) {
$fieldName = $tableName . "." . $fieldData["name"];
$oCriteria->addSelectColumn($fieldName);
}
}
}
@@ -868,23 +878,25 @@ class AppCacheView extends BaseAppCacheView
return $oCriteria;
} else {
//else this list do not have a PM Table
if (is_array($this->confCasesList) && !empty($this->confCasesList['second']['data'])) {
foreach ($this->confCasesList['second']['data'] as $fieldData) {
switch ($fieldData['fieldType']) {
case 'case field':
$configTable = 'APP_CACHE_VIEW';
break;
case 'delay field':
$configTable = 'APP_DELAY';
break;
default:
$configTable = 'APP_CACHE_VIEW';
break;
}
//This list do not have a PMTable
if (is_array($this->confCasesList) && count($this->confCasesList["second"]["data"]) > 0) {
foreach ($this->confCasesList["second"]["data"] as $fieldData) {
if (in_array($fieldData["name"], $defaultFields)) {
switch ($fieldData["fieldType"]) {
case "case field":
$configTable = "APP_CACHE_VIEW";
break;
case "delay field":
$configTable = "APP_DELAY";
break;
default:
$configTable = "APP_CACHE_VIEW";
break;
}
$fieldName = $configTable . '.' . $fieldData['name'];
$oCriteria->addSelectColumn($fieldName);
$fieldName = $configTable . "." . $fieldData["name"];
$oCriteria->addSelectColumn($fieldName);
}
}
} else {
//foreach ($defaultFields as $field) {

753
workflow/engine/methods/cases/casesListExtJs.php
View File

File diff suppressed because it is too large Load Diff