baculum: Tweak add level directive to new job wizard

diff --git a/gui/baculum/protected/Web/Pages/NewJobWizard.page b/gui/baculum/protected/Web/Pages/NewJobWizard.page
index e3fd4f0ae8dd280b395b545981dd4fcd86cda055..e627dde59e6dfc7a7f688270ab82df007f41b29b 100644 (file)
--- a/gui/baculum/protected/Web/Pages/NewJobWizard.page
+++ b/gui/baculum/protected/Web/Pages/NewJobWizard.page
@@ -318,6 +318,14 @@
                        <div class="w3-container">
                                <h2><%[ Job directives ]%></h2>
                        </div>
+                       <div class="w3-container">
+                               <com:Application.Web.Portlets.DirectiveComboBox
+                                       ID="Level"
+                                       DirectiveName="Level"
+                                       Label="Level"
+                                       Show="true"
+                                       />
+                       </div>
                        <div class="w3-container">
                                <com:Application.Web.Portlets.DirectiveCheckBox
                                        ID="Accurate"
@@ -455,7 +463,7 @@
                                </div>
                                <div class="w3-container">
                                        <div class="w3-quarter">JobDefs</div>
-                                       <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue()%></div>
+                                       <div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
                                </div>
                        </fieldset>
                        <fieldset>
@@ -536,6 +544,13 @@
                        </fieldset>
                        <fieldset>
                                <legend><%[ How ]%></legend>
+                               <div class="w3-container">
+                                       <div class="w3-quarter">Level</div>
+                                       <div class="w3-threequarter bold">
+                                               <%=$this->Level->getDirectiveValue() ?: '-'%>
+                                               <span class="w3-small normal"><%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+                                       </div>
+                               </div>
                                <div class="w3-container">
                                        <div class="w3-quarter">Accurate</div>
                                        <div class="w3-threequarter bold">

diff --git a/gui/baculum/protected/Web/Pages/NewJobWizard.php b/gui/baculum/protected/Web/Pages/NewJobWizard.php
index ade0e20467572e60e992d283fa1b676401bfc589..3185b80016c5cc5198632edbb3b7aad0fba06a9d 100644 (file)
--- a/gui/baculum/protected/Web/Pages/NewJobWizard.php
+++ b/gui/baculum/protected/Web/Pages/NewJobWizard.php
@@ -39,6 +39,7 @@ class NewJobWizard extends BaculumWebPage {
                $this->FullBackupPool->saveDirective();
                $this->IncrementalBackupPool->saveDirective();
                $this->DifferentialBackupPool->saveDirective();
+               $this->Level->saveDirective();
                $this->Messages->saveDirective();
                $this->Schedule->saveDirective();
        }
@@ -72,6 +73,7 @@ class NewJobWizard extends BaculumWebPage {
                        }
                        case 3: {
                                $this->loadBackupJobDirectives();
+                               $this->loadLevels();
                                $this->loadMessages();
                                break;
                        }
@@ -360,6 +362,24 @@ class NewJobWizard extends BaculumWebPage {
                }
        }
 
+
+       /**
+        * Load job levels.
+        *
+        * @return none
+        */
+       public function loadLevels() {
+               // so far backup job levels only
+               $level_list = array(
+                       'Full', 'Incremental', 'Differential', 'VirtualFull'
+               );
+               $this->Level->setData($level_list);
+               $jobdefs = $this->getJobDefs();
+               if (key_exists('Level', $jobdefs)) {
+                       $this->Level->setDirectiveValue($jobdefs['Level']);
+               }
+               $this->Level->onLoad(null);
+       }
        /**
         * Load messages.
         *
@@ -409,7 +429,7 @@ class NewJobWizard extends BaculumWebPage {
                $jd = $this->JobDefs->getDirectiveValue();
                $directives = array('Client', 'Fileset', 'Storage', 'SpoolData', 'SpoolAttributes',
                        'SpoolSize', 'Pool', 'FullBackupPool', 'IncrementalBackupPool', 'DifferentialBackupPool',
-                       'Accurate', 'MaximumConcurrentJobs', 'Priority', 'ReRunFailedLevels', 'Schedule',
+                       'Level', 'Accurate', 'MaximumConcurrentJobs', 'Priority', 'ReRunFailedLevels', 'Schedule',
                        'RescheduleOnError', 'RescheduleIncompleteJobs', 'RescheduleInterval', 'RescheduleTimes',
                        'Messages'
                );