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

BUG-14636 New Functionality - To allow set index in tables IMPROVEMENT

Browse Source 
- It don't have the functionality.
    - A functionality was added in pmtables and reportTables index.
    - A field was added in table fields FLD_TABLE_INDEX.
This commit is contained in:
Marco Antonio Nina
2014-09-12 12:28:15 -04:00
parent d5babe7774
commit 0df429f409
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
if ($column->field_index) {
if (isset($column->field_index) && $column->field_index) {
$columnNode->setAttribute( 'index', "true" );
$indexColumnNode = $this->dom->createElement( 'index-column' );
$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_AUTO_INCREMENT' => $column->field_autoincrement ? 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_TABLE' => '',
'FLD_DYN_NAME' => $column->field_dyn,

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

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