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 3afa90707adcdd1cbbab3f2516fcf0c3090758cc..464916b4c419a6d8fe408a3599abde5911f29105 100644 (file)
--- 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 bfe392414a6855ba2fe57a19839d75432a3876ca..e00e73fc3e51c0283afeb90af4a7a3d0d152a7e2 100644 (file)
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 ebe254a18b41b82af61a8227e99cc3a7b13a1b44..f86f771f3d9a395b72b61769d4e76d87469e8d5d 100644 (file)
--- 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 2b8a19c6cfba9b3af16b5c360ed19cb66a4ce250..e57f76e8468e1d8f1aa8523cfe964da8330c0f2f 100644 (file)
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 937e470f8eaede59d2d0dc158476a8aa27583897..92cf9b5bdcab6f1c609145660d27f1b5ee800904 100644 (file)
--- 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 d2f1976c5b65f346a60916088bd06542ce98c1c8..22e48b039361126effb67173d88d6351f32be129 100644 (file)
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 e23605c3b7c0b8f7aff7c78baf9624b2f93b6b8b..74c5bb555ff14fb4d007029045ccd5ace74aff07 100644 (file)
--- 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 e6a9184a494e864a9ea224d84d9f3bb7e1b57761..bff3bb7aa0bdcae1e09238fcd887ed7b0d82c45b 100644 (file)
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 bab41feb7320916f35bf0cb5c881c8ceb7eb9451..b18eeab0009e05f3c505bad2405149762760c3a1 100644 (file)
--- 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 c4a543f8fe89d59a865c77121d5bd8cb1a33fa1f..50b1def0dfee47bcdc1b787e7d30066a373fd5bb 100644 (file)
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 ad1aad9a458b51b14b4accb45ea554f2cff43654..66a1fa0b6585d2f26839374292ce4843e3374795 100644 (file)
--- 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 174928ff0e11ccd42accfd0c34cc547500b791e3..e9cb7ecce360c40ec557f71eb445d0644e2f4650 100644 (file)
--- a/gui/baculum/protected/Web/Layouts/Main.tpl
+++ b/gui/baculum/protected/Web/Layouts/Main.tpl
@@ -55,8 +55,9 @@
                                        />
                                </com:TLabel>
                                <script type="text/javascript">
-                                       var SIZE_VALUES_UNIT = '<%=(count($this->web_config) > 0 && key_exists('size_values_unit', $this->web_config['baculum'])) ? $this->web_config['baculum']['size_values_unit'] : WebConfig::DEF_SIZE_VAL_UNIT%>';
-                                       var DATE_TIME_FORMAT = '<%=(count($this->web_config) > 0 && key_exists('date_time_format', $this->web_config['baculum'])) ? $this->web_config['baculum']['date_time_format'] : WebConfig::DEF_DATE_TIME_FORMAT%>';
+                                       const SIZE_VALUES_UNIT = '<%=(count($this->web_config) > 0 && key_exists('size_values_unit', $this->web_config['baculum'])) ? $this->web_config['baculum']['size_values_unit'] : WebConfig::DEF_SIZE_VAL_UNIT%>';
+                                       const DATE_TIME_FORMAT = '<%=(count($this->web_config) > 0 && key_exists('date_time_format', $this->web_config['baculum'])) ? $this->web_config['baculum']['date_time_format'] : WebConfig::DEF_DATE_TIME_FORMAT%>';
+                                       const KEEP_TABLE_SETTINGS = <%=(count($this->web_config) > 0 && key_exists('keep_table_settings', $this->web_config['baculum'])) ? $this->web_config['baculum']['keep_table_settings'] : WebConfig::DEF_KEEP_TABLE_SETTINGS%>;
                                </script>
                                <com:TContentPlaceHolder ID="Main" />
                                <!-- Footer -->

diff --git a/gui/baculum/protected/Web/Layouts/Wizard.tpl b/gui/baculum/protected/Web/Layouts/Wizard.tpl
index 6fc3c64fd360268f3838fd581043b757d77483e1..e872257def106fb950c1204bccd1c54e6621611e 100644 (file)
--- a/gui/baculum/protected/Web/Layouts/Wizard.tpl
+++ b/gui/baculum/protected/Web/Layouts/Wizard.tpl
@@ -7,8 +7,9 @@
        </com:THead>
        <body  class="w3-light-grey">
                <script type="text/javascript">
-                       var SIZE_VALUES_UNIT = '<%=(count($this->web_config) > 0 && key_exists('size_values_unit', $this->web_config['baculum'])) ? $this->web_config['baculum']['size_values_unit'] : WebConfig::DEF_SIZE_VAL_UNIT%>';
-                       var DATE_TIME_FORMAT = '<%=(count($this->web_config) > 0 && key_exists('date_time_format', $this->web_config['baculum'])) ? $this->web_config['baculum']['date_time_format'] : WebConfig::DEF_DATE_TIME_FORMAT%>';
+                       const SIZE_VALUES_UNIT = '<%=(count($this->web_config) > 0 && key_exists('size_values_unit', $this->web_config['baculum'])) ? $this->web_config['baculum']['size_values_unit'] : WebConfig::DEF_SIZE_VAL_UNIT%>';
+                       const DATE_TIME_FORMAT = '<%=(count($this->web_config) > 0 && key_exists('date_time_format', $this->web_config['baculum'])) ? $this->web_config['baculum']['date_time_format'] : WebConfig::DEF_DATE_TIME_FORMAT%>';
+                       const KEEP_TABLE_SETTINGS = <%=(count($this->web_config) > 0 && key_exists('keep_table_settings', $this->web_config['baculum'])) ? $this->web_config['baculum']['keep_table_settings'] : WebConfig::DEF_KEEP_TABLE_SETTINGS%>;
                </script>
                <com:TForm>
                        <com:TClientScript PradoScripts="ajax, effects" />

diff --git a/gui/baculum/protected/Web/Modules/WebConfig.php b/gui/baculum/protected/Web/Modules/WebConfig.php
index ddc79116f08d20308fcc9d2cae7e8e5057a77316..bdadd86a4837f7b1ee3300eb1f918447763a5c29 100644 (file)
--- 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 7c29bc0ee1b2d523be4b0f4f994db5b8b7d5c8fe..b227c0418020e428b4f6460e9c39ca405686133e 100644 (file)
--- a/gui/baculum/protected/Web/Pages/ApplicationSettings.page
+++ b/gui/baculum/protected/Web/Pages/ApplicationSettings.page
@@ -45,6 +45,55 @@
                        />
                </div>
        </div>
+       <div class="w3-container w3-row w3-padding">
+               <div class="w3-quarter w3-col"><%[ Keep custom table settings: ]%></div>
+               <div class="w3-quarter w3-col">
+                       <p><com:TRadioButton
+                               ID="KeepTableSettingsNoLimit"
+                               CssClass="w3-radio"
+                               GroupName="KeepTableSettings"
+                               Attributes.onclick="$('#keep_table_settings_specific_time').hide(); if (Prado.Validation.validateControl('<%=$this->KeepTableSettingsFor->Directive->ClientID%>') === false) { reset_keep_time_settings_for_field(); }"
+                       /> <com:TLabel ForControl="KeepTableSettingsNoLimit"><%[ No time limit (persistent settings) ]%></com:TLabel></p>
+                       <p>
+                       <com:TRadioButton
+                               ID="KeepTableSettingsEndOfSession"
+                               CssClass="w3-radio"
+                               GroupName="KeepTableSettings"
+                               Attributes.onclick="$('#keep_table_settings_specific_time').hide(); if (Prado.Validation.validateControl('<%=$this->KeepTableSettingsFor->Directive->ClientID%>') === false) { reset_keep_time_settings_for_field(); }"
+                       /> <com:TLabel ForControl="KeepTableSettingsEndOfSession"><%[ Until end of web browser session ]%></com:TLabel></p>
+                       <com:TRadioButton
+                               ID="KeepTableSettingsSpecificTime"
+                               CssClass="w3-radio"
+                               GroupName="KeepTableSettings"
+                               Attributes.onclick="$('#keep_table_settings_specific_time').show(); Prado.Validation.validateControl('<%=$this->KeepTableSettingsFor->Directive->ClientID%>')"
+                       /> <com:TLabel ForControl="KeepTableSettingsSpecificTime"><%[ For specific time ]%></com:TLabel></p>
+               </div>
+               <div id="keep_table_settings_specific_time" style="display: <%=$this->KeepTableSettingsSpecificTime->Checked ? 'block' : 'none'%>;">
+                       <com:Baculum.Web.Portlets.DirectiveTimePeriod
+                               ID="KeepTableSettingsFor"
+                               DirectiveName="KeepTableSettingsFor"
+                               Label="<%[ Keep table settings for ]%>"
+                               ValidationGroup="AppSetting"
+                               DefaultValue="<%=WebConfig::DEF_KEEP_TABLE_SETTINGS%>"
+                               Show="true"
+                               Required="true"
+                               ShowResetButton="false"
+                               ShowRemoveButton="false"
+                               TimeFormat="hour"
+                               Doc="<%[ Set time for which table settings will be preserved. Setting 0 (zero) is equivalent to no time limit option. ]%>"
+                       />
+               </div>
+               <script>
+                       function reset_keep_time_settings_for_field() {
+                               const ctl_id = '<%=$this->KeepTableSettingsFor->Directive->ClientID%>';
+                               const ctl_format_id = '<%=$this->KeepTableSettingsFor->TimeFormat->ClientID%>';
+                               const val = '<%=$this->KeepTableSettingsFor->getValue() ?: $this->KeepTableSettingsFor->DefaultValue%>';
+                               const ftime = Units.format_time_period(parseInt(val, 'seconds'));
+                               $('#' + ctl_id).val(ftime.value);
+                               $('#' + ctl_format_id).val(ftime.format);
+                       }
+               </script>
+       </div>
        <div class="w3-container w3-row w3-padding">
                <div class="w3-quarter w3-col"><%[ Show size values as: ]%></div>
                <div class="w3-quarter w3-col">

diff --git a/gui/baculum/protected/Web/Pages/ApplicationSettings.php b/gui/baculum/protected/Web/Pages/ApplicationSettings.php
index c7f100c8e4d43ada06886679f68163a4987db1b2..58b030d776111acdd6814e6ee10f5eec6dc0c2b3 100644 (file)
--- 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 5383bf57e75d397d76fd965221118be515d3c657..7f77fa2f91dab3e7a6eef184cec38a15ea597605 100644 (file)
--- 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 3f39af40834c76dc6d4eae6ca0d3d100f16543c5..043ee57308f26a66d5e8646bd28f466721a5b509 100644 (file)
--- 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 59c64eb5982709b83c5fd25142465d95a92874ac..b2f72b942f9ceecad5f6ab0b7674e5bef248f110 100644 (file)
--- 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 9cf93c8e74bfaec13913e69d6be693508c63cdf0..54415c2076627ce72c1625af82628dfa72197d02 100644 (file)
--- 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 6bf2a395fb42c4da2d1e989b075a17dd44ead689..a19c45b733bfe9fb093f2c8717c9eab28d9b2f2f 100644 (file)
--- 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 c132ee130b5cc7c96519c999e354ef2caa85d4f8..829c38f8439c72c2ab8180281610cfe7a79d078f 100644 (file)
--- 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 94623cf2bbe33d655218ef996d95f0aeae583a57..e5c1eb701abbe6380e10edb23e93452ca7d2ce35 100644 (file)
--- 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 6bddac047808cd1da9c88978a12c0985a98e3850..83da466f8be06d6811d96da6ede08c6c40fc99fd 100644 (file)
--- 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 f7cca96d2deb9e838c37438a00f15d3da0a99500..e5f890ebf4c9286613da2a6b59cdfa28f034d2fa 100644 (file)
--- 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 5654d7174e0bea35c9462bd8621034a55aae9fca..f78de3e25bb79ed12a5866513e05af4ba87bb096 100644 (file)
--- 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 e1a84fc58c922c8904c58486ec9ad916b2d9513c..002ddbd6dc1ab57df4f25709a4a1f5656221aa88 100644 (file)
--- 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 bde80e5bb0e5897d400cca6cb8725425399af313..7e39965c0b789527a584455c2555a85712a8fe81 100644 (file)
--- 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 d45266b5e7bdf308ee4676bbce94647b64d0f141..b8c460a5ad8679841a47f4beea24b183779e2232 100644 (file)
--- 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 11aede6d6ec8812e2af3046c2b67189638ce6070..dc86ac685e4f7f96abe6fc676300be1fbc4002f8 100644 (file)
--- 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 711e785e85b873203705c95173c8269c1c0c65ba..9bfbfadf2309ea63ce4ad0700502db909d70b8c8 100644 (file)
--- 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 327761f739dc2e2f38992b9d9afa009b7cc73566..77ff64fec655ce0fea3516cd560d0281f76a6c98 100644 (file)
--- 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 6bf9e3b4e25560d38753e54ed9e19b1665cc2031..e05134f7b6c014c8d4e77764e0655c38e33f5cbf 100644 (file)
--- 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 59ccbaefe817aa132ef6d0038b4eb1fbfedd53bd..80ad1fb92a15f3d6ec5d4f70ed4052b84d0b4ac8 100644 (file)
--- 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 cd67bec2bc2cfceb77de017693ad7fb7ea516f77..8b402b80206db520d68db1a146e8fb78d9795af9 100644 (file)
--- 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'
                        ],