fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 000 momentarily reverted to rc5 fro pmTables (fixes)

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2011-09-05 16:40:47 -04:00
parent f56d333bf7
commit f35f3bb39f
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -506,15 +506,19 @@ class pmTablesProxy extends HttpProxyController
$primaryKeys = $additionalTables->getPrimaryKeys(); $primaryKeys = $additionalTables->getPrimaryKeys();
foreach ($result['rows'] as $i => $row) { if ($result) {
$primaryKeysValues = array(); foreach ($result['rows'] as $i => $row) {
foreach ($primaryKeys as $key) { $primaryKeysValues = array();
$primaryKeysValues[] = isset($row[$key['FLD_NAME']]) ? $row[$key['FLD_NAME']] : ''; foreach ($primaryKeys as $key) {
$primaryKeysValues[] = isset($row[$key['FLD_NAME']]) ? $row[$key['FLD_NAME']] : '';
}
$result['rows'][$i]['__index__'] = G::encrypt(implode('-', $primaryKeysValues), 'pmtable');
} }
}
$result['rows'][$i]['__index__'] = G::encrypt(implode('-', $primaryKeysValues), 'pmtable'); else {
$result['rows'] = array();
} }
return $result; return $result;
} }

7
workflow/engine/templates/pmTables/data.js
View File

@@ -15,6 +15,7 @@ var smodel;
var infoGrid; var infoGrid;
var _fields; var _fields;
var isReport; var isReport;
var editor;
Ext.onReady(function(){ Ext.onReady(function(){
@@ -141,7 +142,9 @@ Ext.onReady(function(){
afteredit : { afteredit : {
fn:function(rowEditor, obj, data, rowIndex ){ fn:function(rowEditor, obj, data, rowIndex ){
if (data.phantom === true) { if (data.phantom === true) {
store.reload(); // <-- (just for old pmtables class engine) only if it is an insert setTimeout(function(){
store.reload();
}, 1100); // <-- (just for old pmtables class engine) only if it is an insert
} }
} }
} }
@@ -325,7 +328,7 @@ DoNothing = function(){};
var props = function(){}; var props = function(){};
NewPMTableRow = function(){ NewPMTableRow = function(){
if (editor.editing) { if (!editor || editor.editing) {
return false; return false;
} }
var PMRow = infoGrid.getStore().recordType; var PMRow = infoGrid.getStore().recordType;

5
workflow/engine/templates/pmTables/edit.js
View File

@@ -662,6 +662,11 @@ function createReportTable()
PMExt.error(_('ID_ERROR'),_('ID_PMTABLES_ALERT1') + ' <b>' + row.data['field_name']+'</b>'); PMExt.error(_('ID_ERROR'),_('ID_PMTABLES_ALERT1') + ' <b>' + row.data['field_name']+'</b>');
return false; return false;
} }
if (row.data['field_name'] == 'DESC') {
PMExt.error(_('ID_ERROR'), 'The word "DESC" is reserved by the database engine please set another one.');
return false;
}
// validate that fieldname is not empty // validate that fieldname is not empty
if(row.data['field_name'].trim() == '') { if(row.data['field_name'].trim() == '') {