diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php index 5acc72382..c6cbb9431 100755 --- a/gulliver/system/class.headPublisher.php +++ b/gulliver/system/class.headPublisher.php @@ -283,6 +283,10 @@ class headPublisher { $head = ''; $head .= " \n"; $head .= " \n"; + $aux = explode('-', strtolower(SYS_LANG)); + if (($aux[0] != 'en') && file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $aux[0] . '.js')) { + $head .= " \n"; + } // enabled for particular use $head .= $this->getExtJsLibraries(); diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js index cc82685c6..fc93caa18 100755 --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -100,7 +100,7 @@ Ext.onReady(function(){ listeners:{ selectionchange: function(sm){ switch(sm.getCount()){ - case 0: + case 0: //Ext.getCmp('removeButton').disable(); Ext.getCmp('editColumn').disable(); Ext.getCmp('removeColumn').disable(); @@ -110,7 +110,7 @@ Ext.onReady(function(){ Ext.getCmp('removeColumn').enable(); break; default: - //Ext.getCmp('removeButton').enable(); + //Ext.getCmp('removeButton').enable(); Ext.getCmp('editColumn').disable(); Ext.getCmp('removeColumn').enable(); break; @@ -303,7 +303,7 @@ Ext.onReady(function(){ //if a column was set as PK so can't be null if (row.get('field_key') == true) { row.data.field_null = false; - + } row.commit(); } @@ -359,7 +359,7 @@ Ext.onReady(function(){ if (typeof(cindex) != "undefined") { for(var i = 0; i < rows.length; i++) { //skipping primary keys, we can't reorder - if (rows[i].data.field_key ) + if (rows[i].data.field_key ) continue; var srcIndex = ds.indexOfId(rows[i].id); @@ -587,13 +587,13 @@ Ext.onReady(function(){ southPanel = new Ext.FormPanel({ region: 'south', - buttons:[ + buttons:[ { text: TABLE === false ? _("ID_CREATE") : _("ID_UPDATE"), handler: function() { if (TABLE === false || dataNumRows == 0) { createReportTable(); - } + } else { PMExt.confirm(_('ID_CONFIRM'), _('ID_PMTABLE_SAVE_AND_DATA_LOST'), createReportTable); } @@ -622,7 +622,7 @@ Ext.onReady(function(){ loadTableRowsFromArray(TABLE.FIELDS); } - + if (dataNumRows > 0) { var tpl = new Ext.Template( '