diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index e5331438c..c52b8efae 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -869,7 +869,7 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm 'UI:Display_X_ItemsPerPage' => '%1$s Elemente pro Seite anzeigen', 'UI:UseSavetheSettings' => 'Einstellungen speichern', 'UI:OnlyForThisList' => 'Nur für diese Liste', - 'UI:ForAllLists' => 'Für alle Listen', + 'UI:ForAllLists' => 'Standard für alle Listen', 'UI:ExtKey_AsLink' => '%1$s (Link)', 'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)', 'UI:ExtField_AsRemoteField' => '%1$s (%2$s)', diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index 808f49861..939cb8ea3 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -1057,7 +1057,7 @@ When associated with a trigger, each action is given an "order" number, specifyi 'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page', 'UI:UseSavetheSettings' => 'Save the Settings', 'UI:OnlyForThisList' => 'Only for this list', - 'UI:ForAllLists' => 'For all lists', + 'UI:ForAllLists' => 'Default for all lists', 'UI:ExtKey_AsLink' => '%1$s (Link)', 'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)', 'UI:ExtField_AsRemoteField' => '%1$s (%2$s)', diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php index 9c976ea58..c1d8e7798 100644 --- a/dictionaries/es_cr.dictionary.itop.ui.php +++ b/dictionaries/es_cr.dictionary.itop.ui.php @@ -1032,7 +1032,7 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden", 'UI:Display_X_ItemsPerPage' => 'Desplegar %1$s elementos por página', 'UI:UseSavetheSettings' => 'Guardar Configuraciones', 'UI:OnlyForThisList' => 'Sólo esta Lista', - 'UI:ForAllLists' => 'Para todas las Listas', + 'UI:ForAllLists' => 'Defecto en todas las listas', 'UI:ExtKey_AsLink' => '%1$s (Liga)', 'UI:ExtKey_AsFriendlyName' => '%1$s (Nombre Común)', 'UI:ExtField_AsRemoteField' => '%1$s (%2$s)', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index 183f5fc33..a0afd2ee2 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -900,7 +900,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé 'UI:Display_X_ItemsPerPage' => 'Afficher %1$s éléments par page', 'UI:UseSavetheSettings' => 'Enregistrer ces réglages', 'UI:OnlyForThisList' => 'Seulement pour cette liste', - 'UI:ForAllLists' => 'Pour toutes les listes', + 'UI:ForAllLists' => 'Défaut pour toutes les listes', 'UI:ExtKey_AsLink' => '%1$s (Lien)', 'UI:ExtKey_AsFriendlyName' => '%1$s (Nom)', 'UI:ExtField_AsRemoteField' => '%1$s (%2$s)', diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php index 2bfcd3d2f..feb2fdd40 100644 --- a/dictionaries/ja.dictionary.itop.ui.php +++ b/dictionaries/ja.dictionary.itop.ui.php @@ -875,7 +875,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'UI:Display_X_ItemsPerPage' => '1ページに %1$s アイテムを表示', 'UI:UseSavetheSettings' => 'セッティングを保存', 'UI:OnlyForThisList' => 'このリストのみ', - 'UI:ForAllLists' => '全てのリスト', + 'UI:ForAllLists' => 'すべてのリストのデフォルト', 'UI:ExtKey_AsLink' => '%1$s (Link)', 'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)', 'UI:ExtField_AsRemoteField' => '%1$s (%2$s)', diff --git a/pages/ajax.render.php b/pages/ajax.render.php index c1bca0502..1f883fc06 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -207,6 +207,14 @@ try if ($bSaveAsDefaults) { + if ($sTableId != null) + { + $oCurrSettings = DataTableSettings::GetTableSettings($aClassAliases, $sTableId, true /* bOnlyTable */ ); + if ($oCurrSettings) + { + $oCurrSettings->ResetToDefault(false); // Reset this table to the defaults + } + } $bRet = $oSettings->SaveAsDefault(); } else