baculum: Improve selecting storage value in run job window

diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index 8d30002aeccc9e8a2f2bf5ba6194c0de2bd45d86..1e8c639c8278f6b1e5bc160d05a54782f9d1d768 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 049f87f07c4ccb095713a735fc93a6d843617203..b2091c1ae3af0053a51fc666c8310db5b32153c2 100644 (file)
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -2359,3 +2359,6 @@ msgstr "Raw job log"
 
 msgid "Not available"
 msgstr "Not available"
+
+msgid "The storage has been selected basing on job configuration. This item may require adjusting before job run."
+msgstr "The storage has been selected basing on job configuration. This item may require adjusting before job run."

diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo
index 609319933f92be7784b9c4ea3c638cfce9cd4fef..e7b6fc958da70e6fc77d49675dde4002fecafadb 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 09ef8e794dfa98e3927d5295d2fe030b0362ce0d..60bbce5a4f6ae5b930c249c24e1f983a875b42ee 100644 (file)
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -2445,3 +2445,6 @@ msgstr "Raw job log"
 
 msgid "Not available"
 msgstr "Not available"
+
+msgid "The storage has been selected basing on job configuration. This item may require adjusting before job run."
+msgstr "The storage has been selected basing on job configuration. This item may require adjusting before job run."

diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index ef64e6a1757738471bf37b0b751cc28e0ec8cb3b..95a5b27ee1d01b24fea76ca5ead7e03b21067913 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 aaffb3206f2be47bb8ada48221ff0ecaf07037a6..8269b22a3a381a2afd390581c1f59b2e43ae3aee 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -2366,3 +2366,6 @@ msgstr "Surowy dziennik zadania"
 
 msgid "Not available"
 msgstr "Niedostępny"
+
+msgid "The storage has been selected basing on job configuration. This item may require adjusting before job run."
+msgstr "Wartość magazynu danych została wybrana, bazując na konfiguracji zadania. Ta opcja może wymagać dopasowania przed uruchomieniem zadania."

diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index 70994e23785d72e90a00c193a8b1e3d871f05ee1..6e607046ba45931d374249f52be1ee457c1496f7 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 4df9ba859072617881574c4a2e41439d0e788d3f..5fffba0332d7d1d6ac98eb4255fc2af85b0032dc 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -2374,3 +2374,6 @@ msgstr "Raw job log"
 
 msgid "Not available"
 msgstr "Not available"
+
+msgid "The storage has been selected basing on job configuration. This item may require adjusting before job run."
+msgstr "The storage has been selected basing on job configuration. This item may require adjusting before job run."

diff --git a/gui/baculum/protected/Web/Portlets/RunJob.php b/gui/baculum/protected/Web/Portlets/RunJob.php
index 6a2740b8771547cee22982f0ee856c59c183ae80..8c1f0ab9529ebf8bff9a28d371f97d7e3b27107d 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/RunJob.php
+++ b/gui/baculum/protected/Web/Portlets/RunJob.php
@@ -54,6 +54,14 @@ class RunJob extends Portlets {
                $jobdata = null;
                if ($jobid > 0) {
                        $jobdata = $this->getModule('api')->get(array('jobs', $jobid), null, true, self::USE_CACHE)->output;
+                       $job_show = $this->getModule('api')->get(
+                               array('jobs', 'show', '?name='. rawurlencode($jobdata->name)),
+                               null,
+                               true,
+                               self::USE_CACHE
+                       )->output;
+                       $jobdata->storage = $this->getResourceName('(?:storage|autochanger)', $job_show);
+                       $this->getPage()->getCallbackClient()->show('run_job_storage_from_config_info');
                } elseif (!empty($jobname)) {
                        $jobdata = new stdClass;
                        $job_show = $this->getModule('api')->get(
@@ -72,10 +80,7 @@ class RunJob extends Portlets {
                        $jobdata->client = $this->getResourceName('client', $job_show);
                        $jobdata->fileset = $this->getResourceName('fileset', $job_show);
                        $jobdata->pool = $this->getResourceName('pool', $job_show);
-                       $jobdata->storage = $this->getResourceName('storage', $job_show);
-                       if (empty($jobdata->storage)) {
-                               $jobdata->storage = $this->getResourceName('autochanger', $job_show);
-                       }
+                       $jobdata->storage = $this->getResourceName('(?:storage|autochanger)', $job_show);
                        $jobdata->priorjobid = $job_attr['priority'];
                        $jobdata->accurate = (key_exists('accurate', $job_attr) && $job_attr['accurate'] == 1);
                } else {

diff --git a/gui/baculum/protected/Web/Portlets/RunJob.tpl b/gui/baculum/protected/Web/Portlets/RunJob.tpl
index 0a2ea966e70fa273595109f1388270648b0f4401..4b0c327a30e82494cce45c262dee9a151b879d94 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/RunJob.tpl
+++ b/gui/baculum/protected/Web/Portlets/RunJob.tpl
@@ -108,6 +108,9 @@
                                <div class="w3-half">
                                        <com:TActiveDropDownList ID="Storage" AutoPostBack="false" CssClass="w3-select w3-border" />
                                </div>
+                               <div id="run_job_storage_from_config_info" style="line-height: 39px; display: none;">
+                                       &nbsp;&nbsp;<i class="fas fa-info-circle" title="<%[ The storage has been selected basing on job configuration. This item may require adjusting before job run. ]%>"></i>
+                               </div>
                        </div>
                        <div class="w3-row w3-section w3-text-teal">
                                <div class="w3-col w3-quarter"><i class="w3-xxlarge fa fa-sort-numeric-up"></i> &nbsp;<com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" CssClass="w3-xlarge" /></div>