webstaff: hide alt. enum. and calendar change if not using enumeration

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
index 64405c8..b374ee8 100644 (file)
--- a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
@@ -79,7 +79,7 @@
             </div>
          </div>
       </div>
-      <div class="row">
+      <div ng-if="pattern.use_enum" class="row">
         <div class="checkbox">
           <label>
             <input type="checkbox" ng-model="pattern.use_alt_enum">
@@ -134,7 +134,7 @@
             </div>
          </div>
       </div>
-      <div class="row">
+      <div ng-if="pattern.use_enum" class="row">
         <div class="checkbox">
           <label>
             <input type="checkbox" ng-model="pattern.use_calendar_change">

diff --git a/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js b/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js
index 1eafdfc..78e1e5f 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js
+++ b/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js
@@ -277,7 +277,7 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider) {
                     }
                 }
             }
-            if (self.use_alt_enum) {
+            if (self.use_enum && self.use_alt_enum) {
                 for (var i = 0; i < self.alt_enum_levels.length; i++) {
                     patternCode.push(['g','h'][i]);
                     patternCode.push(self.alt_enum_levels[i].caption);
@@ -320,7 +320,7 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider) {
                     self.frequency_preset
             );
             // calendar change
-            if (self.use_calendar_change) {
+            if (self.use_enum && self.use_calendar_change) {
                 patternCode.push('x');
                 patternCode.push(self.calendar_change.map(function(chg) {
                     if (chg.type == 'season') {