From d450cd127da0f74b4332e6c47a1bc64227ee3ba4 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 14 Aug 2013 15:06:00 -0400 Subject: [PATCH 1/3] Adicion de formulario Extjs para importar usuarios ldap --- .../authSources/authSources_SearchUsers.php | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/workflow/engine/methods/authSources/authSources_SearchUsers.php b/workflow/engine/methods/authSources/authSources_SearchUsers.php index a5956290e..e6e5a6d19 100755 --- a/workflow/engine/methods/authSources/authSources_SearchUsers.php +++ b/workflow/engine/methods/authSources/authSources_SearchUsers.php @@ -50,6 +50,26 @@ if (file_exists( PATH_PLUGINS . $fields['AUTH_SOURCE_PROVIDER'] . PATH_SEP . $fi if ($pluginEnabled == 0) { $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_AUTH_SOURCE_MISSING' ) ) ); G::RenderPage( 'publish', 'blank' ); + } else { + G::LoadClass('configuration'); + $c = new Configurations(); + $configPage = $c->getConfiguration('additionalTablesList', 'pageSize','',$_SESSION['USER_LOGGED']); + $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20; + + $oHeadPublisher = & headPublisher::getSingleton (); + + $oHeadPublisher->assign("FORMATS", $c->getFormats()); + $oHeadPublisher->assign("CONFIG", $Config); + + if (file_exists(PATH_PLUGINS . $fields["AUTH_SOURCE_PROVIDER"] . PATH_SEP . $fields["AUTH_SOURCE_PROVIDER"] . 'Flag')) { + $oHeadPublisher = & headPublisher::getSingleton (); + + $oHeadPublisher->assign("Fields", $fields); + $oHeadPublisher->addExtJsScript (PATH_PLUGINS . $fields["AUTH_SOURCE_PROVIDER"] . PATH_SEP . 'js' . PATH_SEP . 'library', false, true ); + $oHeadPublisher->addExtJsScript (PATH_PLUGINS . $fields["AUTH_SOURCE_PROVIDER"] . PATH_SEP . 'js' . PATH_SEP . 'ldapAdvancedSearch', false, true ); + G::RenderPage ('publish', 'extJs'); + die(); + } } } From 7726f5cc3cc40537fcacf1fbac82e2d9813c6037 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 15 Aug 2013 10:10:20 -0400 Subject: [PATCH 2/3] BUG 12570 No existen etiquetas de traduccion para idioma SOLVED Se agrego etiquetas para los idiomas pt y pt_BR en archivos js para extjs Se arreglo la llamada a estos archivos segun el idioma actual --- gulliver/js/ext/locale/ext-lang-pt.js | 9 +++++++++ gulliver/js/ext/locale/ext-lang-pt_BR.js | 8 ++++++++ gulliver/system/class.headPublisher.php | 13 ++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/gulliver/js/ext/locale/ext-lang-pt.js b/gulliver/js/ext/locale/ext-lang-pt.js index cec535d73..4f2e3747b 100644 --- a/gulliver/js/ext/locale/ext-lang-pt.js +++ b/gulliver/js/ext/locale/ext-lang-pt.js @@ -245,6 +245,15 @@ if(Ext.grid.GridView){ }); } + +if(Ext.grid.GroupingView){ + Ext.apply(Ext.grid.GroupingView.prototype, { + emptyGroupText : '(Nenhum)', + groupByText : 'Grupo por este campo', + showGroupsText : 'Mostrar em Grupos' + }); +} + if(Ext.grid.PropertyColumnModel){ Ext.apply(Ext.grid.PropertyColumnModel.prototype, { nameText : "Nome", diff --git a/gulliver/js/ext/locale/ext-lang-pt_BR.js b/gulliver/js/ext/locale/ext-lang-pt_BR.js index 03c6b1553..ad48f18da 100644 --- a/gulliver/js/ext/locale/ext-lang-pt_BR.js +++ b/gulliver/js/ext/locale/ext-lang-pt_BR.js @@ -287,6 +287,14 @@ if(Ext.grid.GridView){ }); } +if(Ext.grid.GroupingView){ + Ext.apply(Ext.grid.GroupingView.prototype, { + emptyGroupText : '(Nenhum)', + groupByText : 'Grupo por este campo', + showGroupsText : 'Mostrar em Grupos' + }); +} + if(Ext.grid.PropertyColumnModel){ Ext.apply(Ext.grid.PropertyColumnModel.prototype, { nameText : "Nome", diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php index f1c1f4191..3161166d7 100644 --- a/gulliver/system/class.headPublisher.php +++ b/gulliver/system/class.headPublisher.php @@ -313,9 +313,16 @@ class headPublisher $head = $head . " \n"; $head = $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 = $head . " \n"; + if (SYS_LANG != 'en') { + $tempLang = str_replace('-', '_', SYS_LANG); + if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $tempLang . '.js')) { + $head = $head . " \n"; + } else { + $aux = explode('-', strtolower(SYS_LANG)); + if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $aux[0] . '.js')) { + $head = $head . " \n"; + } + } } // enabled for particular use From f5ad41e710bcb5b0c46c2ae5f36ceb73098fdc3d Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 16 Aug 2013 11:03:36 -0400 Subject: [PATCH 3/3] BUG 12616 Adicion de etiquetas hardcodeada SOLVED Se agrego una etiqueta y nuevas traduccion para extjs --- gulliver/js/ext/locale/ext-lang-pt.js | 2 ++ gulliver/js/ext/locale/ext-lang-pt_BR.js | 2 ++ workflow/engine/templates/pmTables/editReport.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gulliver/js/ext/locale/ext-lang-pt.js b/gulliver/js/ext/locale/ext-lang-pt.js index 4f2e3747b..5efe02270 100644 --- a/gulliver/js/ext/locale/ext-lang-pt.js +++ b/gulliver/js/ext/locale/ext-lang-pt.js @@ -267,6 +267,8 @@ if (Ext.ux.grid.RowEditor) { Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Cancelar"; Ext.ux.grid.RowEditor.prototype.saveText = "Salvar"; Ext.ux.grid.RowEditor.prototype.cancelText = "Cancelar"; + Ext.ux.grid.RowEditor.prototype.errorText = "Erros"; + Ext.ux.grid.RowEditor.prototype.commitChangesText = "Você precisa atualizar ou cancelar suas alterações"; } if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){ diff --git a/gulliver/js/ext/locale/ext-lang-pt_BR.js b/gulliver/js/ext/locale/ext-lang-pt_BR.js index ad48f18da..80d2c6b63 100644 --- a/gulliver/js/ext/locale/ext-lang-pt_BR.js +++ b/gulliver/js/ext/locale/ext-lang-pt_BR.js @@ -308,6 +308,8 @@ if (Ext.ux.grid.RowEditor) { Ext.ux.grid.RowEditor.prototype.cancelBtnText = "Cancelar"; Ext.ux.grid.RowEditor.prototype.saveText = "Salvar"; Ext.ux.grid.RowEditor.prototype.cancelText = "Cancelar"; + Ext.ux.grid.RowEditor.prototype.errorText = "Erros"; + Ext.ux.grid.RowEditor.prototype.commitChangesText = "Você precisa atualizar ou cancelar suas alterações"; } if(Ext.layout.BorderLayout && Ext.layout.BorderLayout.SplitRegion){ diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index e284b12e0..3da3523d4 100755 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -1218,7 +1218,7 @@ loadFieldNormal = function(){ }); var assignedGridGotData = Ext.getCmp('assignedGrid').getStore().getCount() > 0; if(assignedGridGotData) { - Ext.MessageBox.confirm('Confirm', 'The row data that you recently created will be deleted?', function(button) { + Ext.MessageBox.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_ASSIGNED_GRID'), function(button) { if(button=='yes'){ Ext.getCmp('assignedGrid').store.removeAll(); }