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

Merged in marcoAntonioNina/processmaker/BUG-14636 (pull request #777)

Browse Source 
BUG-14636 New Functionality - To allow set index in tables IMPROVEMENT
This commit is contained in:
Julio Cesar Laura Avendaño
2014-09-12 12:35:23 -04:00
parent 604087e423 0df429f409
commit d8f63002b4
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmTable.php
View File

@@ -302,7 +302,7 @@ class PmTable
} }
// define the Index attribute if it is defined // define the Index attribute if it is defined
if ($column->field_index) { if (isset($column->field_index) && $column->field_index) {
$columnNode->setAttribute( 'index', "true" ); $columnNode->setAttribute( 'index', "true" );
$indexColumnNode = $this->dom->createElement( 'index-column' ); $indexColumnNode = $this->dom->createElement( 'index-column' );
$indexColumnNode->setAttribute( 'name', $column->field_name ); $indexColumnNode->setAttribute( 'name', $column->field_name );

2
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -322,7 +322,7 @@ class pmTablesProxy extends HttpProxyController
'FLD_NULL' => $column->field_null ? 1 : 0, 'FLD_NULL' => $column->field_null ? 1 : 0,
'FLD_AUTO_INCREMENT' => $column->field_autoincrement ? 1 : 0, 'FLD_AUTO_INCREMENT' => $column->field_autoincrement ? 1 : 0,
'FLD_KEY' => $column->field_key ? 1 : 0, 'FLD_KEY' => $column->field_key ? 1 : 0,
'FLD_TABLE_INDEX' => $column->field_index ? 1 : 0, 'FLD_TABLE_INDEX' => (isset($column->field_index) && $column->field_index) ? 1 : 0,
'FLD_FOREIGN_KEY' => 0, 'FLD_FOREIGN_KEY' => 0,
'FLD_FOREIGN_KEY_TABLE' => '', 'FLD_FOREIGN_KEY_TABLE' => '',
'FLD_DYN_NAME' => $column->field_dyn, 'FLD_DYN_NAME' => $column->field_dyn,

8
workflow/engine/templates/pmTables/editReport.js
View File

@@ -1152,6 +1152,12 @@ function createReportTable()
return false; return false;
} }
if (row.data['field_index']) {
hasSomeIndex = true;
} else {
hasSomeIndex = false;
}
if (row.data['field_key']) { if (row.data['field_key']) {
hasSomePrimaryKey = true; hasSomePrimaryKey = true;
} }
@@ -1246,7 +1252,7 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldIndex, fieldInc, sizeEdi
var swI = 1; var swI = 1;
//Date //Date
if (fieldTypeValue == "DATE" || fieldTypeValue == "DATETIME" || fieldTypeValue == "TIME") { if (fieldTypeValue == "DATE" || fieldTypeValue == "DATETIME" || fieldTypeValue == "TIME" || fieldTypeValue == "TEXT") {
swSize = 0; //Disable swSize = 0; //Disable
swPK = 0; swPK = 0;
swAI = 0; swAI = 0;