From b7c41d65577da6a1bdafc3f48aeafb8e38e69535 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Wed, 2 Oct 2013 17:11:12 -0400 Subject: [PATCH 1/5] =?UTF-8?q?BUG-13132=20SOLVED=20En=20'Google=20Chrome'?= =?UTF-8?q?=20el=20panel=20de=20navegaci=C3=B3n=20'ADMIN=20/=20PM=20Tables?= =?UTF-8?q?'=20al=20realizar=20un=20edici=C3=B3n=20de=20un=20PM=20Table,?= =?UTF-8?q?=20que=20contenga=20datos=20el=20mensaje=20de=20advertencia:=20?= =?UTF-8?q?'Warning:=201=20record(s)=20was/were=20found=20on=20this=20tabl?= =?UTF-8?q?e,=20if=20you=20edit=20its=20structure=20all=20data=20will=20lo?= =?UTF-8?q?st.=20[=20Hide=20]'=20oculta=20todo=20el=20panel=20principal=20?= =?UTF-8?q?si=20se=20oprime=20el=20enlace=20'[=20Hide=20]'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/pmTables/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 workflow/engine/templates/pmTables/edit.js diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js old mode 100755 new mode 100644 index 86f8a7168..a274c303f --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -716,7 +716,7 @@ Ext.onReady(function(){ if (dataNumRows > 0) { var tpl = new Ext.Template( '' + 'Warning: ' + dataNumRows + ' ' + _('ID_PMTABLE_DATA_EXISTS_WARNINIG') + ' [ '+_('ID_HIDE')+' ]' ); var newEl = tpl.insertFirst(document.getElementById('assignedGrid')); From 29b83d8bb38eb017e84f260f37e3d9227d780625 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Thu, 3 Oct 2013 12:46:30 -0400 Subject: [PATCH 2/5] BUG 13131 "Popup movible innecesario al momento..." SOLVED - Popup movible innecesario al momento de adicionar una nueva fila para ser llenada en el "Data" de los PM Tables - Problema: En ADMIN>Settings>PMTable al seleccionar de la lista un PM Table y al hacer click en la opcion "Data", al agregar una fila y al introducir datos erroneos aparece un mensaje en movimiento dificultado su visibilidad. - Solucion: Se elimino el mensaje en movimiento cambiandolo por otro, donde se muestra el mensaje sin ninguna dificultad. Disponible para la version 2.5.2 rFieldsEnableDisable --- workflow/engine/templates/pmTables/data.js | 34 ++++++++++++++++++++++ workflow/engine/templates/pmTables/edit.js | 34 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index c3d179d78..451b919ec 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -196,9 +196,39 @@ Ext.onReady(function(){ }); //row editor for table columns grid + var flagShowMessageError = 1; + if (!isReport) { editor = new Ext.ux.grid.RowEditor({ saveText : _("ID_UPDATE"), + isValid: function () + { + var valid = true; + this.items.each(function(f) { + if(!f.isValid(true)){ + valid = false; + + if (valid) { + flagShowMessageError = 1; + } + + return false; + } + }); + + if (valid) { + flagShowMessageError = 1; + } + + return valid; + }, + showTooltip: function (msg) + { + if (flagShowMessageError == 1) { + Ext.msgBoxSlider.msgTopCenter("error", _("ID_ERROR"), msg, 3); + flagShowMessageError = 0; + } + }, listeners : { afteredit : { fn:function(rowEditor, obj, data, rowIndex ){ @@ -206,6 +236,10 @@ Ext.onReady(function(){ //store.reload(); // only if it is an insert } } + }, + canceledit: function (grid, obj) + { + flagShowMessageError = 1; } } }); diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js index 86f8a7168..163b477fb 100755 --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -242,6 +242,8 @@ Ext.onReady(function(){ var sizeEdit = Ext.getCmp("sizeEdit"); editorFieldsEnableDisable(selCombo, fieldNull, fieldPrimaryKey, fieldInc, sizeEdit); + + flagShowMessageError = 1; } }//select } @@ -339,13 +341,45 @@ Ext.onReady(function(){ ] }); //row editor for table columns grid + var flagShowMessageError = 1; + editor = new Ext.ux.grid.RowEditor({ saveText: _("ID_UPDATE"), + isValid: function () + { + var valid = true; + this.items.each(function(f) { + if(!f.isValid(true)){ + valid = false; + + if (valid) { + flagShowMessageError = 1; + } + + return false; + } + }); + + if (valid) { + flagShowMessageError = 1; + } + + return valid; + }, + showTooltip: function (msg) + { + if (flagShowMessageError == 1) { + Ext.msgBoxSlider.msgTopCenter("error", _("ID_ERROR"), msg, 3); + flagShowMessageError = 0; + } + }, listeners: { canceledit: function(grid,obj){ if ( grid.record.data.field_label == '' && grid.record.data.field_name == '') { store.remove(grid.record); } + + flagShowMessageError = 1; } } }); From d4afcca61bc4f539b8b395acc75668de823697e8 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Thu, 3 Oct 2013 14:58:00 -0400 Subject: [PATCH 3/5] BUG 13131 "Popup movible innecesario al momento..." SOLVED - Popup movible innecesario al momento de adicionar una nueva fila para ser llenada en el "Data" de los PM Tables - Problema: En ADMIN>Settings>PMTable al seleccionar de la lista un PM Table y al hacer click en la opcion "Data", al agregar una fila y al introducir datos erroneos aparece un mensaje en movimiento dificultado su visibilidad. - Solucion: Se elimino el mensaje en movimiento cambiandolo por otro, donde se muestra el mensaje sin ninguna dificultad. Disponible para la version 2.5.2 pup movible innecesario al momento..." SOLVED - Popup movible innecesario al momento de adicionar una nueva fila para ser llenada en el "Data" de los PM Tables - Problema: En ADMIN>Settings>PMTable al seleccionar de la lista un PM Table y al hacer click en la opcion "Data", al agregar una fila y al introducir datos erroneos aparece un mensaje en movimiento dificultado su visibilidad. - Solucion: Se elimino el mensaje en movimiento cambiandolo por otro, donde se muestra el mensaje sin ninguna dificultad. Disponible para la version 2.5.2 --- workflow/engine/templates/pmTables/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 451b919ec..5e7bd4763 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -199,7 +199,7 @@ Ext.onReady(function(){ var flagShowMessageError = 1; if (!isReport) { - editor = new Ext.ux.grid.RowEditor({ + editor = new Ext.ux.grid.RowEditor({ saveText : _("ID_UPDATE"), isValid: function () { From 0800a3b9a5174a7f941d2fe3a011a6d7c75dd6d1 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 4 Oct 2013 14:14:33 -0400 Subject: [PATCH 4/5] =?UTF-8?q?BUG-13197=20Al=20realizar=20el=20procedimie?= =?UTF-8?q?nto=20de=20actualizaci=C3=B3n=20de=20la=20versi=C3=B3n=20de=20P?= =?UTF-8?q?rocessMaker=20v2.0.x=20a=20la=20versi=C3=B3n=20de=20ProcessMake?= =?UTF-8?q?r=20v2.5.1,=20la=20lista=20de=20usuarios=20/ADMIN/Users,=20apar?= =?UTF-8?q?ece=20en=20blanco,=20dando=20la=20impresi=C3=B3n=20aparente=20d?= =?UTF-8?q?e=20que=20no=20existe=20ning=C3=BAn=20usuario,=20muy=20al=20con?= =?UTF-8?q?trario=20la=20lista=20de=20roles=20/ADMIN/Roles,=20opci=C3=B3n?= =?UTF-8?q?=20Users:=20muestra=20los=20usuarios=20asignados=20al=20rol=20c?= =?UTF-8?q?on=20normalidad.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/methods/users/users_Ajax.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100755 => 100644 workflow/engine/methods/users/users_Ajax.php diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php old mode 100755 new mode 100644 index e8802a8e2..3cf296881 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -437,7 +437,11 @@ try { $rows = Array(); while ($oDataset->next()) { $row = $oDataset->getRow(); - $uRole = $oRoles->loadByCode($row['USR_ROLE']); + try { + $uRole = $oRoles->loadByCode($row['USR_ROLE']); + } catch (exception $oError) { + $uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' ); + } $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE']; $row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1; $row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : ''; From 4e55f382f5a530901f9e374d620fac09c4c50f37 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 4 Oct 2013 14:27:00 -0400 Subject: [PATCH 5/5] =?UTF-8?q?BUG-13197=20Al=20realizar=20el=20procedimie?= =?UTF-8?q?nto=20de=20actualizaci=C3=B3n=20de=20la=20versi=C3=B3n=20de=20P?= =?UTF-8?q?rocessMaker=20v2.0.x=20a=20la=20versi=C3=B3n=20de=20ProcessMake?= =?UTF-8?q?r=20v2.5.1,=20la=20lista=20de=20usuarios=20/ADMIN/Users,=20apar?= =?UTF-8?q?ece=20en=20blanco,=20dando=20la=20impresi=C3=B3n=20aparente=20d?= =?UTF-8?q?e=20que=20no=20existe=20ning=C3=BAn=20usuario,=20muy=20al=20con?= =?UTF-8?q?trario=20la=20lista=20de=20roles=20/ADMIN/Roles,=20opci=C3=B3n?= =?UTF-8?q?=20Users,=20muestra=20los=20usuarios=20asignados=20al=20rol=20c?= =?UTF-8?q?on=20normalidad.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/methods/users/users_Ajax.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index 3cf296881..0ae4c9336 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -435,6 +435,7 @@ try { $oRoles = new Roles(); $rows = Array(); + $uRole = Array(); while ($oDataset->next()) { $row = $oDataset->getRow(); try {