bug 1310213: Correcting UI and backend for Delete Scheduled change up…

…date button (#198). r=bhearsum
mozilla-releng · Dec 21, 2016 · e65508b · e65508b
1 parent 7765a57
commit e65508b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 26 deletions.
diff --git a/auslib/admin/views/forms.py b/auslib/admin/views/forms.py
@@ -245,6 +245,10 @@ class EditScheduledChangeExistingRuleForm(ScheduledChangeForm, EditRuleForm):
     sc_data_version = IntegerField('sc_data_version', validators=[InputRequired()], widget=HiddenInput())
 
 
+class EditScheduledChangeDeleteRuleForm(ScheduledChangeForm):
+    sc_data_version = IntegerField('sc_data_version', validators=[Required()], widget=HiddenInput())
+
+
 class SignoffForm(Form):
     role = StringField('Role', validators=[InputRequired()])
 

diff --git a/auslib/admin/views/rules.py b/auslib/admin/views/rules.py
@@ -12,7 +12,7 @@
 from auslib.admin.views.forms import EditRuleForm, RuleForm, DbEditableForm, \
     ScheduledChangeNewRuleForm, ScheduledChangeExistingRuleForm, \
     ScheduledChangeDeleteRuleForm, EditScheduledChangeNewRuleForm, \
-    EditScheduledChangeExistingRuleForm
+    EditScheduledChangeExistingRuleForm, EditScheduledChangeDeleteRuleForm
 from auslib.admin.views.scheduled_changes import ScheduledChangesView, \
     ScheduledChangeView, EnactScheduledChangeView, ScheduledChangeHistoryView, \
     SignoffsView
@@ -341,14 +341,18 @@ def __init__(self):
     @requirelogin
     def _post(self, sc_id, transaction, changed_by):
         if request.json and request.json.get("data_version"):
-            form = EditScheduledChangeExistingRuleForm()
+            if request.json.get("change_type") == "delete":
+                form = EditScheduledChangeDeleteRuleForm()
+            else:
+                form = EditScheduledChangeExistingRuleForm()
         else:
             form = EditScheduledChangeNewRuleForm()
 
-        releaseNames = dbo.releases.getReleaseNames(transaction=transaction)
+        if request.json.get("change_type") != "delete":
+            releaseNames = dbo.releases.getReleaseNames(transaction=transaction)
 
-        form.mapping.choices = [(item['name'], item['name']) for item in releaseNames]
-        form.mapping.choices.insert(0, ('', 'NULL'))
+            form.mapping.choices = [(item['name'], item['name']) for item in releaseNames]
+            form.mapping.choices.insert(0, ('', 'NULL'))
 
         return super(RuleScheduledChangeView, self)._post(sc_id, form, transaction, changed_by)
 

diff --git a/ui/app/templates/rule_scheduled_change_modal.html b/ui/app/templates/rule_scheduled_change_modal.html
@@ -12,7 +12,7 @@ <h4>Scheduled Change Details</h4>
       <!-- Bootstrap disables them for "disabled" elements, but pointer events are forcibly enabled here to allow the tooltip to be shown. -->
       <button id="btn_telemetry" class="btn disabled" style="pointer-events: auto" title="Not available yet" type="button" ng-click="toggleType('telemetry')">Telemetry Based</button>
     </div>
-    <div class="row" ng-show="sc_type === 'time'">
+      <div class="row" ng-show="sc_type === 'time'">
       <div class="col-md-8 col-md-offset-2">
         <label for="id_when">When</label>
         <div class="form-group dropdown" is-open="calendar_is_open" ng-class="{'has-error': errors.when}">
@@ -63,17 +63,17 @@ <h4>Scheduled Change Details</h4>
       </div>
     </div>
     <hr>
-    <h4>Rule Details</h4>
+    <h4 ng-show= "sc.change_type !== 'delete'">Rule Details</h4>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.product}">
         <label for="id_product">Product</label>
         <input type="text" class="form-control" id="id_product" ng-model="sc.product"
         typeahead="product for product in products | filter:$viewValue | limitTo:16">
         <p class="help-block" ng-show="errors.product">{{ errors.product.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.channel}">
         <label for="id_channel">Channel</label>
         <input type="text" class="form-control" id="id_channel" ng-model="sc.channel"
@@ -83,15 +83,15 @@ <h4>Rule Details</h4>
         </div>
     </div>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.mapping}">
         <label for="id_mapping">Mapping</label>
         <input type="text" class="form-control" id="id_mapping" ng-model="sc.mapping"
         typeahead="name for name in names | filter:$viewValue | limitTo:16">
         <p class="help-block" ng-show="errors.mapping">{{ errors.mapping.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.fallbackMapping}">
         <label for="id_fallbackMapping">Fallback Mapping</label>
         <input type="text" class="form-control" id="id_fallbackMapping" ng-model="sc.fallbackMapping"
@@ -101,30 +101,30 @@ <h4>Rule Details</h4>
       </div>
     </div>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.backgroundRate}">
         <label for="id_rate">Rate</label>
         <input type="number" class="form-control" id="id_rate" ng-model="sc.backgroundRate">
         <p class="help-block" ng-show="errors.backgroundRate">{{ errors.backgroundRate.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.priority}">
         <label for="id_priority">Priority</label>
         <input type="number" class="form-control" id="id_priority" ng-model="sc.priority">
         <p class="help-block" ng-show="errors.priority">{{ errors.priority.join(', ') }}</p>
         </div>
       </div>
     </div>
-    <div class="row">
-      <div class="col-md-6">
+    <div class="row" >
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.version}">
         <label for="id_version">Version</label>
         <input type="text" class="form-control" id="id_version" ng-model="sc.version">
         <p class="help-block" ng-show="errors.version">{{ errors.version.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.buildID}">
         <label for="id_buildID">Build ID</label>
         <input type="text" class="form-control" id="id_buildID" ng-model="sc.buildID">
@@ -133,14 +133,14 @@ <h4>Rule Details</h4>
       </div>
     </div>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.locale}">
         <label for="id_locale">Locale</label>
         <input type="text" class="form-control" id="id_locale" ng-model="sc.locale">
         <p class="help-block" ng-show="errors.locale">{{ errors.locale.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.distribution}">
         <label for="id_distribution">Distribution</label>
         <input type="text" class="form-control" id="id_distribution" ng-model="sc.distribution">
@@ -149,14 +149,14 @@ <h4>Rule Details</h4>
       </div>
     </div>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.buildTarget}">
         <label for="id_buildTarget">Build Target</label>
         <input type="text" class="form-control" id="id_buildTarget" ng-model="sc.buildTarget">
         <p class="help-block" ng-show="errors.buildTarget">{{ errors.buildTarget.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.osVersion}">
         <label for="id_osVersion">OS Version</label>
         <input type="text" class="form-control" id="id_osVersion" ng-model="sc.osVersion">
@@ -165,14 +165,14 @@ <h4>Rule Details</h4>
       </div>
     </div>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.systemCapabilities}">
         <label for="id_systemCapabilities">System Capabilities</label>
         <input type="text" class="form-control" id="id_systemCapabilities" ng-model="sc.systemCapabilities">
         <p class="help-block" ng-show="errors.systemCapabilities">{{ errors.systemCapabilities.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.distVersion}">
         <label for="id_distribution">Dist version</label>
         <input type="text" class="form-control" id="id_distribution" ng-model="sc.distVersion">
@@ -181,15 +181,15 @@ <h4>Rule Details</h4>
       </div>
     </div>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.whitelist}">
         <label for="id_whitelist">Whitelist</label>
         <input type="text" class="form-control" id="id_whitelist" ng-model="sc.whitelist"
         typeahead="name for name in names | filter:$viewValue | limitTo:16">
         <p class="help-block" ng-show="errors.whitelist">{{ errors.whitelist.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.update_type}">
         <label for="id_update_type">Update Type</label>
         <input type="text" class="form-control" id="id_update_type" ng-model="sc.update_type">
@@ -198,14 +198,14 @@ <h4>Rule Details</h4>
       </div>
     </div>
     <div class="row">
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.headerArchitecture}">
         <label for="id_headerArchitecture">Header Architecture</label>
         <input type="text" class="form-control" id="id_headerArchitecture" ng-model="sc.headerArchitecture">
         <p class="help-block" ng-show="errors.headerArchitecture">{{ errors.headerArchitecture.join(', ') }}</p>
         </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6" ng-show= "sc.change_type !== 'delete'">
         <div class="form-group" ng-class="{'has-error': errors.comment}">
         <label for="id_comment">Comment</label>
         <input type="text" class="form-control" id="id_comment" ng-model="sc.comment">