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

Merge pull request #1973 from brayanpereyra/master

Browse Source 
Resolución de BUG 12570 - Adición para mostrar Extjs en ldapAdvanced
This commit is contained in:
julceslauhub
2013-08-16 14:33:54 -07:00
parent 7efa9794a1 f5ad41e710
commit eeaf9a1b93
5 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gulliver/js/ext/locale/ext-lang-pt.js
View File

@@ -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",
@@ -258,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){

10
gulliver/js/ext/locale/ext-lang-pt_BR.js
View File

@@ -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",
@@ -300,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){

13
gulliver/system/class.headPublisher.php
View File

@@ -313,9 +313,16 @@ class headPublisher
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-base.js") . "\"></script>\n";
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-all.js") . "\"></script>\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 . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $aux[0] . ".js") . "\"></script>\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 . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $tempLang . ".js") . "\"></script>\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 . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $aux[0] . ".js") . "\"></script>\n";
}
}
}
// enabled for particular use

20
workflow/engine/methods/authSources/authSources_SearchUsers.php
View File

@@ -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();
}
}
}

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

@@ -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();
}