From: Marcin Haba Date: Mon, 1 May 2023 11:12:45 +0000 (+0200) Subject: baculum: Add options to configure preserving table settings X-Git-Tag: Release-13.0.3~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f867ed2732d10cbb0e789341fd37a3f905b7db51;p=thirdparty%2Fbacula.git baculum: Add options to configure preserving table settings This function is ported from Bacularis. The function request comes from Lionel Plasse reported to Baculum on the Bacula-Users mailing list: https://sourceforge.net/p/bacula/mailman/message/37837701/ --- diff --git a/gui/baculum/protected/Web/JavaScript/misc.js b/gui/baculum/protected/Web/JavaScript/misc.js index 3afa90707..464916b4c 100644 --- a/gui/baculum/protected/Web/JavaScript/misc.js +++ b/gui/baculum/protected/Web/JavaScript/misc.js @@ -640,6 +640,7 @@ var oLastJobsList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -889,7 +890,9 @@ var Dashboard = { update_job_access: function() { // get last 15 jobs var data = this.stats.jobs.slice(0, 15); - oLastJobsList.init(data); + $(function() { + oLastJobsList.init(data); + }); }, update_jobs: function() { var jobs = this.stats.jobs_occupancy; diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo index bfe392414..e00e73fc3 100644 Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po index ebe254a18..f86f771f3 100644 --- a/gui/baculum/protected/Web/Lang/en/messages.po +++ b/gui/baculum/protected/Web/Lang/en/messages.po @@ -3958,3 +3958,21 @@ msgstr "Set age for jobs to display the job summary pie graph on the dashboard p msgid "last %time %unit" msgstr "last %time %unit" + +msgid "Keep custom table settings:" +msgstr "Keep custom table settings:" + +msgid "No time limit (persistent settings)" +msgstr "No time limit (persistent settings)" + +msgid "Until end of web browser session" +msgstr "Until end of web browser session" + +msgid "For specific time" +msgstr "For specific time" + +msgid "The value must be positive integer or zero." +msgstr "The value must be positive integer or zero." + +msgid "Keep table settings for" +msgstr "Keep table settings for" diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo index 2b8a19c6c..e57f76e84 100644 Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po index 937e470f8..92cf9b5bd 100644 --- a/gui/baculum/protected/Web/Lang/ja/messages.po +++ b/gui/baculum/protected/Web/Lang/ja/messages.po @@ -4044,3 +4044,21 @@ msgstr "Set age for jobs to display the job summary pie graph on the dashboard p msgid "last %time %unit" msgstr "last %time %unit" + +msgid "Keep custom table settings:" +msgstr "Keep custom table settings:" + +msgid "No time limit (persistent settings)" +msgstr "No time limit (persistent settings)" + +msgid "Until end of web browser session" +msgstr "Until end of web browser session" + +msgid "For specific time" +msgstr "For specific time" + +msgid "The value must be positive integer or zero." +msgstr "The value must be positive integer or zero." + +msgid "Keep table settings for" +msgstr "Keep table settings for" diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo index d2f1976c5..22e48b039 100644 Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po index e23605c3b..74c5bb555 100644 --- a/gui/baculum/protected/Web/Lang/pl/messages.po +++ b/gui/baculum/protected/Web/Lang/pl/messages.po @@ -3969,3 +3969,21 @@ msgstr "Ustaw maksymalny wiek dla zadań do wyświetlenia na wykresie statusu za msgid "last %time %unit" msgstr "ostatni %time %unit" + +msgid "Keep custom table settings:" +msgstr "Keep custom table settings:" + +msgid "No time limit (persistent settings)" +msgstr "No time limit (persistent settings)" + +msgid "Until end of web browser session" +msgstr "Until end of web browser session" + +msgid "For specific time" +msgstr "For specific time" + +msgid "The value must be positive integer or zero." +msgstr "The value must be positive integer or zero." + +msgid "Keep table settings for" +msgstr "Keep table settings for" diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo index e6a9184a4..bff3bb7aa 100644 Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po index bab41feb7..b18eeab00 100644 --- a/gui/baculum/protected/Web/Lang/pt/messages.po +++ b/gui/baculum/protected/Web/Lang/pt/messages.po @@ -3970,3 +3970,21 @@ msgstr "Set age for jobs to display the job summary pie graph on the dashboard p msgid "last %time %unit" msgstr "last %time %unit" + +msgid "Keep custom table settings:" +msgstr "Keep custom table settings:" + +msgid "No time limit (persistent settings)" +msgstr "No time limit (persistent settings)" + +msgid "Until end of web browser session" +msgstr "Until end of web browser session" + +msgid "For specific time" +msgstr "For specific time" + +msgid "The value must be positive integer or zero." +msgstr "The value must be positive integer or zero." + +msgid "Keep table settings for" +msgstr "Keep table settings for" diff --git a/gui/baculum/protected/Web/Lang/ru/messages.mo b/gui/baculum/protected/Web/Lang/ru/messages.mo index c4a543f8f..50b1def0d 100644 Binary files a/gui/baculum/protected/Web/Lang/ru/messages.mo and b/gui/baculum/protected/Web/Lang/ru/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/ru/messages.po b/gui/baculum/protected/Web/Lang/ru/messages.po index ad1aad9a4..66a1fa0b6 100644 --- a/gui/baculum/protected/Web/Lang/ru/messages.po +++ b/gui/baculum/protected/Web/Lang/ru/messages.po @@ -3969,3 +3969,21 @@ msgstr "Set age for jobs to display the job summary pie graph on the dashboard p msgid "last %time %unit" msgstr "last %time %unit" + +msgid "Keep custom table settings:" +msgstr "Keep custom table settings:" + +msgid "No time limit (persistent settings)" +msgstr "No time limit (persistent settings)" + +msgid "Until end of web browser session" +msgstr "Until end of web browser session" + +msgid "For specific time" +msgstr "For specific time" + +msgid "The value must be positive integer or zero." +msgstr "The value must be positive integer or zero." + +msgid "Keep table settings for" +msgstr "Keep table settings for" diff --git a/gui/baculum/protected/Web/Layouts/Main.tpl b/gui/baculum/protected/Web/Layouts/Main.tpl index 174928ff0..e9cb7ecce 100644 --- a/gui/baculum/protected/Web/Layouts/Main.tpl +++ b/gui/baculum/protected/Web/Layouts/Main.tpl @@ -55,8 +55,9 @@ /> diff --git a/gui/baculum/protected/Web/Layouts/Wizard.tpl b/gui/baculum/protected/Web/Layouts/Wizard.tpl index 6fc3c64fd..e872257de 100644 --- a/gui/baculum/protected/Web/Layouts/Wizard.tpl +++ b/gui/baculum/protected/Web/Layouts/Wizard.tpl @@ -7,8 +7,9 @@ diff --git a/gui/baculum/protected/Web/Modules/WebConfig.php b/gui/baculum/protected/Web/Modules/WebConfig.php index ddc79116f..bdadd86a4 100644 --- a/gui/baculum/protected/Web/Modules/WebConfig.php +++ b/gui/baculum/protected/Web/Modules/WebConfig.php @@ -62,6 +62,15 @@ class WebConfig extends ConfigFileModule { */ const DEF_SIZE_VAL_UNIT = 'decimal'; + /** + * Default keep table settings for specific time. + * Values: + * -1 - keep value in sessionStorage. Settings are forget when web browser is closed. + * 0 - keep value in localStorage. Settings are persistent. + * int > 0 - keep value in localStorage for specific given time. + */ + public const DEF_KEEP_TABLE_SETTINGS = 7200; + /** * Default value for showing time in job log. */ diff --git a/gui/baculum/protected/Web/Pages/ApplicationSettings.page b/gui/baculum/protected/Web/Pages/ApplicationSettings.page index 7c29bc0ee..b227c0418 100644 --- a/gui/baculum/protected/Web/Pages/ApplicationSettings.page +++ b/gui/baculum/protected/Web/Pages/ApplicationSettings.page @@ -45,6 +45,55 @@ /> +
+
<%[ Keep custom table settings: ]%>
+
+

<%[ No time limit (persistent settings) ]%>

+

+ <%[ Until end of web browser session ]%>

+ <%[ For specific time ]%>

+
+
+ +
+ +
<%[ Show size values as: ]%>
diff --git a/gui/baculum/protected/Web/Pages/ApplicationSettings.php b/gui/baculum/protected/Web/Pages/ApplicationSettings.php index c7f100c8e..58b030d77 100644 --- a/gui/baculum/protected/Web/Pages/ApplicationSettings.php +++ b/gui/baculum/protected/Web/Pages/ApplicationSettings.php @@ -39,6 +39,23 @@ class ApplicationSettings extends BaculumWebPage { if(count($this->web_config) > 0) { $this->Debug->Checked = ($this->web_config['baculum']['debug'] == 1); $this->MaxJobs->Text = (key_exists('max_jobs', $this->web_config['baculum']) ? intval($this->web_config['baculum']['max_jobs']) : WebConfig::DEF_MAX_JOBS); + if (key_exists('keep_table_settings', $this->web_config['baculum'])) { + if ($this->web_config['baculum']['keep_table_settings'] === '-1') { + // keep settings until end of web browser session + $this->KeepTableSettingsEndOfSession->Checked = true; + } elseif ($this->web_config['baculum']['keep_table_settings'] === '0') { + // keep settings with no time limit (persistent settings) + $this->KeepTableSettingsNoLimit->Checked = true; + } else { + // keep settings for specific time (default 2 hours) + $this->KeepTableSettingsSpecificTime->Checked = true; + $this->KeepTableSettingsFor->setDirectiveValue($this->web_config['baculum']['keep_table_settings']); + } + } else { + // default setting + $this->KeepTableSettingsSpecificTime->Checked = true; + $this->KeepTableSettingsFor->setDirectiveValue(WebConfig::DEF_KEEP_TABLE_SETTINGS); + } if (key_exists('size_values_unit', $this->web_config['baculum'])) { $this->DecimalBytes->Checked = ($this->web_config['baculum']['size_values_unit'] === 'decimal'); $this->BinaryBytes->Checked = ($this->web_config['baculum']['size_values_unit'] === 'binary'); @@ -66,7 +83,16 @@ class ApplicationSettings extends BaculumWebPage { if (count($this->web_config) > 0) { $this->web_config['baculum']['debug'] = ($this->Debug->Checked === true) ? 1 : 0; $max_jobs = intval($this->MaxJobs->Text); + $keep_table_settings = null; + if ($this->KeepTableSettingsNoLimit->Checked) { + $keep_table_settings = '0'; + } elseif ($this->KeepTableSettingsEndOfSession->Checked) { + $keep_table_settings = '-1'; + } elseif ($this->KeepTableSettingsSpecificTime->Checked) { + $keep_table_settings = $this->KeepTableSettingsFor->getValue(); + } $this->web_config['baculum']['max_jobs'] = $max_jobs; + $this->web_config['baculum']['keep_table_settings'] = $keep_table_settings; $this->web_config['baculum']['size_values_unit'] = $this->BinaryBytes->Checked ? 'binary' : 'decimal'; $this->web_config['baculum']['time_in_job_log'] = ($this->TimeInJobLog->Checked === true) ? 1 : 0; $this->web_config['baculum']['date_time_format'] = $this->DateTimeFormat->Text; diff --git a/gui/baculum/protected/Web/Pages/ClientList.page b/gui/baculum/protected/Web/Pages/ClientList.page index 5383bf57e..7f77fa2f9 100644 --- a/gui/baculum/protected/Web/Pages/ClientList.page +++ b/gui/baculum/protected/Web/Pages/ClientList.page @@ -53,6 +53,7 @@ var oClientList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/ClientView.page b/gui/baculum/protected/Web/Pages/ClientView.page index 3f39af408..043ee5730 100644 --- a/gui/baculum/protected/Web/Pages/ClientView.page +++ b/gui/baculum/protected/Web/Pages/ClientView.page @@ -681,6 +681,7 @@ var oJobForClientList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/FileSetList.page b/gui/baculum/protected/Web/Pages/FileSetList.page index 59c64eb59..b2f72b942 100644 --- a/gui/baculum/protected/Web/Pages/FileSetList.page +++ b/gui/baculum/protected/Web/Pages/FileSetList.page @@ -45,6 +45,7 @@ var oFileSetList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/JobHistoryList.page b/gui/baculum/protected/Web/Pages/JobHistoryList.page index 9cf93c8e7..54415c207 100644 --- a/gui/baculum/protected/Web/Pages/JobHistoryList.page +++ b/gui/baculum/protected/Web/Pages/JobHistoryList.page @@ -261,6 +261,7 @@ var oJobHistoryList = { deferRender: true, dom: 'lB<"table_toolbar"><"#table_mode"><"#table_adv_filters">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/JobList.page b/gui/baculum/protected/Web/Pages/JobList.page index 6bf2a395f..a19c45b73 100644 --- a/gui/baculum/protected/Web/Pages/JobList.page +++ b/gui/baculum/protected/Web/Pages/JobList.page @@ -69,6 +69,7 @@ var oJobList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/JobView.page b/gui/baculum/protected/Web/Pages/JobView.page index c132ee130..829c38f84 100644 --- a/gui/baculum/protected/Web/Pages/JobView.page +++ b/gui/baculum/protected/Web/Pages/JobView.page @@ -486,6 +486,7 @@ var oJobHistoryList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page b/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page index 94623cf2b..e5c1eb701 100644 --- a/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page +++ b/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page @@ -374,6 +374,7 @@ var oVolumeList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -802,6 +803,7 @@ var oJobList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -946,6 +948,7 @@ var oClientList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -1204,6 +1207,7 @@ var oVolumeList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page b/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page index 6bddac047..83da466f8 100644 --- a/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page +++ b/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page @@ -374,6 +374,7 @@ var oVolumeList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -800,6 +801,7 @@ var oJobList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -944,6 +946,7 @@ var oClientList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -1202,6 +1205,7 @@ var oVolumeList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/PoolList.page b/gui/baculum/protected/Web/Pages/PoolList.page index f7cca96d2..e5f890ebf 100644 --- a/gui/baculum/protected/Web/Pages/PoolList.page +++ b/gui/baculum/protected/Web/Pages/PoolList.page @@ -55,6 +55,7 @@ var oPoolList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/PoolView.page b/gui/baculum/protected/Web/Pages/PoolView.page index 5654d7174..f78de3e25 100644 --- a/gui/baculum/protected/Web/Pages/PoolView.page +++ b/gui/baculum/protected/Web/Pages/PoolView.page @@ -277,6 +277,7 @@ var oVolumeList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page index e1a84fc58..002ddbd6d 100644 --- a/gui/baculum/protected/Web/Pages/RestoreWizard.page +++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page @@ -369,6 +369,7 @@ var oJobsToRestoreList = { 'copy', 'csv', 'colvis' ], stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, columns: [ { className: 'details-control', diff --git a/gui/baculum/protected/Web/Pages/ScheduleList.page b/gui/baculum/protected/Web/Pages/ScheduleList.page index bde80e5bb..7e39965c0 100644 --- a/gui/baculum/protected/Web/Pages/ScheduleList.page +++ b/gui/baculum/protected/Web/Pages/ScheduleList.page @@ -44,6 +44,7 @@ var oScheduleList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/Security.page b/gui/baculum/protected/Web/Pages/Security.page index d45266b5e..b8c460a5a 100644 --- a/gui/baculum/protected/Web/Pages/Security.page +++ b/gui/baculum/protected/Web/Pages/Security.page @@ -1078,6 +1078,7 @@ var oUserList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -1563,6 +1564,7 @@ var oRoleList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -1988,6 +1990,7 @@ var oConsoleList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -2265,6 +2268,7 @@ var oAPIBasicUserList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -2681,6 +2685,7 @@ var oOAuth2ClientList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -3105,6 +3110,7 @@ var oAPIHostList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/StorageList.page b/gui/baculum/protected/Web/Pages/StorageList.page index 11aede6d6..dc86ac685 100644 --- a/gui/baculum/protected/Web/Pages/StorageList.page +++ b/gui/baculum/protected/Web/Pages/StorageList.page @@ -49,6 +49,7 @@ var oStorageList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/StorageView.page b/gui/baculum/protected/Web/Pages/StorageView.page index 711e785e8..9bfbfadf2 100644 --- a/gui/baculum/protected/Web/Pages/StorageView.page +++ b/gui/baculum/protected/Web/Pages/StorageView.page @@ -1773,6 +1773,7 @@ var oDriveList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], @@ -2031,6 +2032,7 @@ var oSlotList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/VolumeList.page b/gui/baculum/protected/Web/Pages/VolumeList.page index 327761f73..77ff64fec 100644 --- a/gui/baculum/protected/Web/Pages/VolumeList.page +++ b/gui/baculum/protected/Web/Pages/VolumeList.page @@ -203,6 +203,7 @@ var oVolumeList = { deferRender: true, dom: 'lB<"table_toolbar">frtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Pages/VolumeView.page b/gui/baculum/protected/Web/Pages/VolumeView.page index 6bf9e3b4e..e05134f7b 100644 --- a/gui/baculum/protected/Web/Pages/VolumeView.page +++ b/gui/baculum/protected/Web/Pages/VolumeView.page @@ -420,6 +420,7 @@ var oJobsOnVolumeList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl index 59ccbaefe..80ad1fb92 100644 --- a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl +++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl @@ -56,6 +56,7 @@ var oBaculaConfigResourceList<%=$this->ClientID%> = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ], diff --git a/gui/baculum/protected/Web/Portlets/StatusSchedule.tpl b/gui/baculum/protected/Web/Portlets/StatusSchedule.tpl index cd67bec2b..8b402b802 100644 --- a/gui/baculum/protected/Web/Portlets/StatusSchedule.tpl +++ b/gui/baculum/protected/Web/Portlets/StatusSchedule.tpl @@ -135,6 +135,7 @@ var oJobScheduleList = { deferRender: true, dom: 'lBfrtip', stateSave: true, + stateDuration: KEEP_TABLE_SETTINGS, buttons: [ 'copy', 'csv', 'colvis' ],