bug 1380874: Remove signoff/revoke buttons from history. (#392). r=bh…

…earsum
mozilla-releng · Sep 12, 2017 · f705320 · f705320
1 parent f41081d
commit f705320
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/ui/app/templates/permission_scheduled_changes.html b/ui/app/templates/permission_scheduled_changes.html
@@ -42,13 +42,13 @@ <h2>
     <h3 class="panel-title">
       <div style="float: right">
         <i ng-if=" scheduled_changes_rules_count && $first && (currentPage == 1)">Current</i>
-        <button class="btn btn-xs btn-primary" ng-click="signoff(sc)"
-                ng-show="! isEmpty(sc['required_signoffs']) && ! sc['signoffs'].hasOwnProperty(current_user)">
-            Signoff as...
+        <button ng-show="!scheduled_changes_rules_count && (! isEmpty(sc['required_signoffs']) &&
+          !sc['signoffs'].hasOwnProperty(current_user))" class="btn btn-xs btn-primary" ng-click="signoff(sc)">
+          Signoff as...
         </button>
-        <button class="btn btn-xs btn-danger" ng-click="revokeSignoff(sc)"
-                ng-show="! isEmpty(sc['required_signoffs']) && sc['signoffs'].hasOwnProperty(current_user)">
-            Revoke your Signoff
+        <button ng-show="!scheduled_changes_rules_count && (! isEmpty(sc['required_signoffs']) &&
+          sc['signoffs'].hasOwnProperty(current_user))" class="btn btn-xs btn-danger" ng-click="revokeSignoff(sc)">
+          Revoke your Signoff
         </button>
         <button ng-show="!sc.complete" class="btn btn-default btn-xs" ng-click="openScheduledUpdateModal(sc)">Update</button>
         <button ng-show="!sc.complete" class="btn btn-default btn-xs" ng-click="openDeleteModal(sc)">Delete</button>

diff --git a/ui/app/templates/release_scheduled_changes.html b/ui/app/templates/release_scheduled_changes.html
@@ -51,13 +51,13 @@ <h2>
     <h3 class="panel-title">
       <div style="float: right">
         <i ng-if="scheduled_changes_count && $first && (currentPage == 1)">Current</i>
-        <button class="btn btn-xs btn-primary" ng-click="signoff(sc)"
-                ng-show="! isEmpty(sc['required_signoffs']) && ! sc['signoffs'].hasOwnProperty(current_user)">
-            Signoff as...
+        <button ng-show="!scheduled_changes_rules_count && (! isEmpty(sc['required_signoffs']) &&
+          !sc['signoffs'].hasOwnProperty(current_user))" class="btn btn-xs btn-primary" ng-click="signoff(sc)">
+          Signoff as...
         </button>
-        <button class="btn btn-xs btn-danger" ng-click="revokeSignoff(sc)"
-                ng-show="! isEmpty(sc['required_signoffs']) && sc['signoffs'].hasOwnProperty(current_user)">
-            Revoke your Signoff
+        <button ng-show="!scheduled_changes_rules_count && (! isEmpty(sc['required_signoffs']) &&
+          sc['signoffs'].hasOwnProperty(current_user))" class="btn btn-xs btn-danger" ng-click="revokeSignoff(sc)">
+          Revoke your Signoff
         </button>
         <button class="btn btn-default btn-xs" ng-click="openDataModal(sc)">View Data</button>
         <button ng-show="!scheduled_changes_count && !sc.complete" class="btn btn-default btn-xs" ng-click="openUpdateModal(sc)">Update</button>

diff --git a/ui/app/templates/rule_scheduled_changes.html b/ui/app/templates/rule_scheduled_changes.html
@@ -54,13 +54,13 @@ <h2>
     <h3 class="panel-title">
       <div style="float: right">
         <i ng-if=" scheduled_changes_rules_count && $first && (currentPage == 1)">Current</i>
-        <button class="btn btn-xs btn-primary" ng-click="signoff(sc)"
-                ng-show="! isEmpty(sc['required_signoffs']) && ! sc['signoffs'].hasOwnProperty(current_user)">
-            Signoff as...
+        <button ng-show="!scheduled_changes_rules_count && (! isEmpty(sc['required_signoffs']) &&
+          !sc['signoffs'].hasOwnProperty(current_user))" class="btn btn-xs btn-primary" ng-click="signoff(sc)">
+          Signoff as...
         </button>
-        <button class="btn btn-xs btn-danger" ng-click="revokeSignoff(sc)"
-                ng-show="! isEmpty(sc['required_signoffs']) && sc['signoffs'].hasOwnProperty(current_user)">
-            Revoke your Signoff
+        <button ng-show="!scheduled_changes_rules_count && (! isEmpty(sc['required_signoffs']) &&
+          sc['signoffs'].hasOwnProperty(current_user))" class="btn btn-xs btn-danger" ng-click="revokeSignoff(sc)">
+          Revoke your Signoff
         </button>
         <button ng-show="!scheduled_changes_rules_count && !sc.complete" class="btn btn-default btn-xs" ng-click="openUpdateModal(sc)">Update</button>
         <button ng-show="!scheduled_changes_rules_count && !sc.complete" class="btn btn-default btn-xs" ng-click="openDeleteModal(sc)">Delete</button>