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

BUG 10131 "Don't showing the summary and cases notes columns" SOLVED

Browse Source 
- Don't showing the summary and cases notes columns when the Enterprise
  plugin is enabled (Bug 10131)
- The column labels inbox, draft, etc do not change when you change the
  language, this when the Enterprise plugin is enabled (Bug 10101)
- In ADMIN>Settings>CasesList when is load PMTable dropdown always goes
  to the inbox tab
- The labels of the columns that are of the system, are now translated
  with the set language
- In ADMIN>Settings>CasesList, options have been added to complete/upgrade
  the fields of the Cases List
- Before you install/upgrade the Enterprise plugin, you should delete these files:
    path_to_processmaker/workflow/engine/templates/cases/casesListSetup.html
    path_to_processmaker/workflow/engine/templates/cases/casesListSetup.js
- The Enterprise plugin will work correctly if you have a version of
  ProcessMaker 2.0.46 or higher
* Available from version 2.0.46
This commit is contained in:
Victor Saisa Lopez
2012-12-11 10:26:10 -04:00
parent 7ea5a88fb7
commit bef44bcfbd
9 changed files with 533 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) {