From 257d1c62d2e1329650c189514d5cf70241075bd1 Mon Sep 17 00:00:00 2001
From: Jessica Forrester <jforrest@redhat.com>
Date: Tue, 8 Nov 2016 07:53:38 -0500
Subject: [PATCH] Fix canI checks && with something that aren't wrapped in
 parens

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1389734
---
 app/views/browse/_replica-set-actions.html    |  2 +-
 .../_replication-controller-actions.html      |  4 +--
 app/views/browse/deployment-config.html       |  8 ++---
 app/views/browse/deployment.html              |  8 ++---
 app/views/browse/pod.html                     |  2 +-
 app/views/browse/replica-set.html             |  2 +-
 app/views/overview/_service-group.html        |  4 +--
 dist/scripts/templates.js                     | 30 +++++++++----------
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/views/browse/_replica-set-actions.html b/app/views/browse/_replica-set-actions.html
index 907fd6ab00..8d044842c4 100644
--- a/app/views/browse/_replica-set-actions.html
+++ b/app/views/browse/_replica-set-actions.html
@@ -15,7 +15,7 @@
       <a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
          role="button">Add Storage</a>
     </li>
-    <li ng-if="!autoscalers.length && { group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create'">
+    <li ng-if="!autoscalers.length && ({ group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create')">
       <a ng-href="project/{{projectName}}/edit/autoscaler?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
          ng-if="!deployment"
          role="button">Add Autoscaler</a>
diff --git a/app/views/browse/_replication-controller-actions.html b/app/views/browse/_replication-controller-actions.html
index 216dbbed63..8556d3d8b4 100644
--- a/app/views/browse/_replication-controller-actions.html
+++ b/app/views/browse/_replication-controller-actions.html
@@ -1,4 +1,4 @@
-<div ng-if="(('replicationControllers' | canIDoAny) || (!deploymentConfigName && !autoscalers.length && { group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create'))" class="pull-right dropdown">
+<div ng-if="(('replicationControllers' | canIDoAny) || (!deploymentConfigName && !autoscalers.length && ({ group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create')))" class="pull-right dropdown">
   <button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
     Actions
     <span class="caret"></span>
@@ -11,7 +11,7 @@
       <a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{deploymentConfigName}}"
          role="button">Add Storage</a>
     </li>
-    <li ng-if="!deploymentConfigName && 'replicationcontrollers' | canI : 'update'">
+    <li ng-if="!deploymentConfigName && ('replicationcontrollers' | canI : 'update')">
       <a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=ReplicationController&name={{replicaSet.metadata.name}}"
          role="button">Add Storage</a>
     </li>
diff --git a/app/views/browse/deployment-config.html b/app/views/browse/deployment-config.html
index ff56dc532e..5b9bb643eb 100644
--- a/app/views/browse/deployment-config.html
+++ b/app/views/browse/deployment-config.html
@@ -42,10 +42,10 @@ <h1>
                       <a ng-href="{{deploymentConfig | editResourceURL}}" role="button">Edit</a>
                     </li>
                     <li class="divider" ng-if="'deploymentconfigs' | canI : 'update'"></li>
-                    <li ng-if="!deploymentConfig.spec.paused && !updatingPausedState && 'deploymentconfigs' | canI : 'update'">
+                    <li ng-if="!deploymentConfig.spec.paused && !updatingPausedState && ('deploymentconfigs' | canI : 'update')">
                       <a href="" ng-click="setPaused(true)" role="button">Pause Deployment</a>
                     </li>
-                    <li ng-if="deploymentConfig.spec.paused && !updatingPausedState && 'deploymentconfigs' | canI : 'update'">
+                    <li ng-if="deploymentConfig.spec.paused && !updatingPausedState && ('deploymentconfigs' | canI : 'update')">
                       <a href="" ng-click="setPaused(false)" role="button">Resume Deployment</a>
                     </li>
                     <li ng-if="'deploymentconfigs' | canI : 'update'">
@@ -105,7 +105,7 @@ <h1>
                         <strong>{{deploymentConfig.metadata.name}} is paused.</strong>
                         This will stop any new deployments and deployment triggers from running
                         until resumed.
-                        <span ng-if="!updatingPausedState && 'deploymentconfigs' | canI : 'update'">
+                        <span ng-if="!updatingPausedState && ('deploymentconfigs' | canI : 'update')">
                           <a href="" ng-click="setPaused(false)" role="button">Resume deployment</a>
                         </span>
                       </div>
@@ -175,7 +175,7 @@ <h3>Autoscaling</h3>
 
                             <!-- If the CPU request is missing, add an action to set one. -->
                             <a ng-href="project/{{projectName}}/set-limits?kind=DeploymentConfig&name={{deploymentConfig.metadata.name}}"
-                               ng-if="warning.reason === 'NoCPURequest' && 'deploymentconfigs' | canI : 'update'"
+                               ng-if="warning.reason === 'NoCPURequest' && ('deploymentconfigs' | canI : 'update')"
                                role="button">Edit resource
                               <span ng-if="!('cpu' | isRequestCalculated : project)">requests and</span> limits</a>
                           </div>
diff --git a/app/views/browse/deployment.html b/app/views/browse/deployment.html
index 7f4dbe2016..cd9d578229 100644
--- a/app/views/browse/deployment.html
+++ b/app/views/browse/deployment.html
@@ -20,13 +20,13 @@ <h1>
                    class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
                    data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
                 <ul class="dropdown-menu actions action-button">
-                  <li ng-if="!deployment.spec.paused && !updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'">
+                  <li ng-if="!deployment.spec.paused && !updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
                     <a href="" ng-click="setPaused(true)" role="button">Pause Deployment</a>
                   </li>
-                  <li ng-if="deployment.spec.paused && !updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'">
+                  <li ng-if="deployment.spec.paused && !updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
                     <a href="" ng-click="setPaused(false)" role="button">Resume Deployment</a>
                   </li>
-                  <li class="divider" ng-if="!updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'"></li>
+                  <li class="divider" ng-if="!updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')"></li>
                   <li ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'">
                     <a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
                        role="button">Add Storage</a>
@@ -84,7 +84,7 @@ <h1>
                       <strong>{{deployment.metadata.name}} is paused.</strong>
                       This will pause any in-progress rollouts and stop new
                       rollouts from running until the deployment is resumed.
-                      <span ng-if="!updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'">
+                      <span ng-if="!updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
                         <a href="" ng-click="setPaused(false)" role="button">Resume deployment</a>
                       </span>
                     </div>
diff --git a/app/views/browse/pod.html b/app/views/browse/pod.html
index 7148bfe196..7c6a66c6df 100644
--- a/app/views/browse/pod.html
+++ b/app/views/browse/pod.html
@@ -22,7 +22,7 @@ <h1>
                      class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
                      data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
                   <ul class="dropdown-menu actions action-button">
-                    <li ng-if="pod | annotation:'deploymentConfig' && 'deploymentconfigs' | canI : 'update'">
+                    <li ng-if="(pod | annotation:'deploymentConfig') && ('deploymentconfigs' | canI : 'update')">
                       <a ng-href="project/{{project.metadata.name}}/attach-pvc?deploymentconfig={{pod | annotation:'deploymentConfig'}}"
                          role="button">Add Storage</a>
                     </li>
diff --git a/app/views/browse/replica-set.html b/app/views/browse/replica-set.html
index f554fda386..5c7da346e3 100644
--- a/app/views/browse/replica-set.html
+++ b/app/views/browse/replica-set.html
@@ -55,7 +55,7 @@ <h1>
                         <span class="pficon pficon-info" aria-hidden="true"></span>
                         Environment variables can be edited on the <a ng-href="{{deployment | navigateResourceURL}}?tab=environment">deployment</a>.
                       </p>
-                      <p ng-if="'(replicaSet | hasDeploymentConfig) && deploymentconfigs' | canI : 'update'">
+                      <p ng-if="(replicaSet | hasDeploymentConfig) && ('deploymentconfigs' | canI : 'update')">
                         <span class="pficon pficon-info" aria-hidden="true"></span>
                         Environment variables can be edited on the <a ng-href="{{replicaSet | configURLForResource}}?tab=environment">deployment configuration</a>.
                       </p>
diff --git a/app/views/overview/_service-group.html b/app/views/overview/_service-group.html
index ac8347a398..0fb7a804cb 100644
--- a/app/views/overview/_service-group.html
+++ b/app/views/overview/_service-group.html
@@ -75,9 +75,9 @@ <h3 class="route-title truncate">
                 <h2>No grouped services.</h2>
                 <p>
                   No services are grouped with <a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a>.
-                  <span ng-if="(services | hashSize) > 1 && 'services' | canI : 'update'">Add a service to group them together.</span>
+                  <span ng-if="(services | hashSize) > 1 && ('services' | canI : 'update')">Add a service to group them together.</span>
                 </p>
-                <div ng-if="(services | hashSize) > 1 && 'services' | canI : 'update'">
+                <div ng-if="(services | hashSize) > 1 && ('services' | canI : 'update')">
                   <button class="btn btn-primary" ng-click="linkService()">
                     Group Service
                   </button>
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index d85ac257d9..cba1091752 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -1266,7 +1266,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<li ng-if=\"!deployment && ({ group: 'extensions', resource: 'replicasets' } | canI : 'update')\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions\" role=\"button\">Add Storage</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"!autoscalers.length && { group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create'\">\n" +
+    "<li ng-if=\"!autoscalers.length && ({ group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create')\">\n" +
     "<a ng-href=\"project/{{projectName}}/edit/autoscaler?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions\" ng-if=\"!deployment\" role=\"button\">Add Autoscaler</a>\n" +
     "<a ng-href=\"project/{{projectName}}/edit/autoscaler?kind=Deployment&name={{deployment.metadata.name}}&group=extensions\" ng-if=\"deployment\" role=\"button\">Add Autoscaler</a>\n" +
     "</li>\n" +
@@ -1433,7 +1433,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
 
   $templateCache.put('views/browse/_replication-controller-actions.html',
-    "<div ng-if=\"(('replicationControllers' | canIDoAny) || (!deploymentConfigName && !autoscalers.length && { group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create'))\" class=\"pull-right dropdown\">\n" +
+    "<div ng-if=\"(('replicationControllers' | canIDoAny) || (!deploymentConfigName && !autoscalers.length && ({ group: 'extensions', resource: 'horizontalpodautoscalers' } | canI : 'create')))\" class=\"pull-right dropdown\">\n" +
     "<button type=\"button\" class=\"dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs\" data-toggle=\"dropdown\">\n" +
     "Actions\n" +
     "<span class=\"caret\"></span>\n" +
@@ -1443,7 +1443,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<li ng-if=\"deploymentConfigName && ('deploymentconfigs' | canI : 'update')\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{deploymentConfigName}}\" role=\"button\">Add Storage</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"!deploymentConfigName && 'replicationcontrollers' | canI : 'update'\">\n" +
+    "<li ng-if=\"!deploymentConfigName && ('replicationcontrollers' | canI : 'update')\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=ReplicationController&name={{replicaSet.metadata.name}}\" role=\"button\">Add Storage</a>\n" +
     "</li>\n" +
     "<li ng-if=\"!autoscalers.length && ({resource: 'horizontalpodautoscalers', group: 'extensions'} | canI : 'create')\">\n" +
@@ -1977,10 +1977,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<a ng-href=\"{{deploymentConfig | editResourceURL}}\" role=\"button\">Edit</a>\n" +
     "</li>\n" +
     "<li class=\"divider\" ng-if=\"'deploymentconfigs' | canI : 'update'\"></li>\n" +
-    "<li ng-if=\"!deploymentConfig.spec.paused && !updatingPausedState && 'deploymentconfigs' | canI : 'update'\">\n" +
+    "<li ng-if=\"!deploymentConfig.spec.paused && !updatingPausedState && ('deploymentconfigs' | canI : 'update')\">\n" +
     "<a href=\"\" ng-click=\"setPaused(true)\" role=\"button\">Pause Deployment</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"deploymentConfig.spec.paused && !updatingPausedState && 'deploymentconfigs' | canI : 'update'\">\n" +
+    "<li ng-if=\"deploymentConfig.spec.paused && !updatingPausedState && ('deploymentconfigs' | canI : 'update')\">\n" +
     "<a href=\"\" ng-click=\"setPaused(false)\" role=\"button\">Resume Deployment</a>\n" +
     "</li>\n" +
     "<li ng-if=\"'deploymentconfigs' | canI : 'update'\">\n" +
@@ -2030,7 +2030,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "<strong>{{deploymentConfig.metadata.name}} is paused.</strong>\n" +
     "This will stop any new deployments and deployment triggers from running until resumed.\n" +
-    "<span ng-if=\"!updatingPausedState && 'deploymentconfigs' | canI : 'update'\">\n" +
+    "<span ng-if=\"!updatingPausedState && ('deploymentconfigs' | canI : 'update')\">\n" +
     "<a href=\"\" ng-click=\"setPaused(false)\" role=\"button\">Resume deployment</a>\n" +
     "</span>\n" +
     "</div>\n" +
@@ -2087,7 +2087,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"sr-only\">Warning:</span>\n" +
     "{{warning.message}}\n" +
     "\n" +
-    "<a ng-href=\"project/{{projectName}}/set-limits?kind=DeploymentConfig&name={{deploymentConfig.metadata.name}}\" ng-if=\"warning.reason === 'NoCPURequest' && 'deploymentconfigs' | canI : 'update'\" role=\"button\">Edit resource\n" +
+    "<a ng-href=\"project/{{projectName}}/set-limits?kind=DeploymentConfig&name={{deploymentConfig.metadata.name}}\" ng-if=\"warning.reason === 'NoCPURequest' && ('deploymentconfigs' | canI : 'update')\" role=\"button\">Edit resource\n" +
     "<span ng-if=\"!('cpu' | isRequestCalculated : project)\">requests and</span> limits</a>\n" +
     "</div>\n" +
     "\n" +
@@ -2239,13 +2239,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</button>\n" +
     "<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
     "<ul class=\"dropdown-menu actions action-button\">\n" +
-    "<li ng-if=\"!deployment.spec.paused && !updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'\">\n" +
+    "<li ng-if=\"!deployment.spec.paused && !updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')\">\n" +
     "<a href=\"\" ng-click=\"setPaused(true)\" role=\"button\">Pause Deployment</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"deployment.spec.paused && !updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'\">\n" +
+    "<li ng-if=\"deployment.spec.paused && !updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')\">\n" +
     "<a href=\"\" ng-click=\"setPaused(false)\" role=\"button\">Resume Deployment</a>\n" +
     "</li>\n" +
-    "<li class=\"divider\" ng-if=\"!updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'\"></li>\n" +
+    "<li class=\"divider\" ng-if=\"!updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')\"></li>\n" +
     "<li ng-if=\"{ group: 'extensions', resource: 'deployments' } | canI : 'update'\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions\" role=\"button\">Add Storage</a>\n" +
     "</li>\n" +
@@ -2292,7 +2292,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "<strong>{{deployment.metadata.name}} is paused.</strong>\n" +
     "This will pause any in-progress rollouts and stop new rollouts from running until the deployment is resumed.\n" +
-    "<span ng-if=\"!updatingPausedState && { group: 'extensions', resource: 'deployments' } | canI : 'update'\">\n" +
+    "<span ng-if=\"!updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')\">\n" +
     "<a href=\"\" ng-click=\"setPaused(false)\" role=\"button\">Resume deployment</a>\n" +
     "</span>\n" +
     "</div>\n" +
@@ -2754,7 +2754,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</button>\n" +
     "<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
     "<ul class=\"dropdown-menu actions action-button\">\n" +
-    "<li ng-if=\"pod | annotation:'deploymentConfig' && 'deploymentconfigs' | canI : 'update'\">\n" +
+    "<li ng-if=\"(pod | annotation:'deploymentConfig') && ('deploymentconfigs' | canI : 'update')\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?deploymentconfig={{pod | annotation:'deploymentConfig'}}\" role=\"button\">Add Storage</a>\n" +
     "</li>\n" +
     "<li ng-if=\"'pods' | canI : 'update'\">\n" +
@@ -2931,7 +2931,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "Environment variables can be edited on the <a ng-href=\"{{deployment | navigateResourceURL}}?tab=environment\">deployment</a>.\n" +
     "</p>\n" +
-    "<p ng-if=\"'(replicaSet | hasDeploymentConfig) && deploymentconfigs' | canI : 'update'\">\n" +
+    "<p ng-if=\"(replicaSet | hasDeploymentConfig) && ('deploymentconfigs' | canI : 'update')\">\n" +
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "Environment variables can be edited on the <a ng-href=\"{{replicaSet | configURLForResource}}?tab=environment\">deployment configuration</a>.\n" +
     "</p>\n" +
@@ -9716,9 +9716,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<h2>No grouped services.</h2>\n" +
     "<p>\n" +
     "No services are grouped with <a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>.\n" +
-    "<span ng-if=\"(services | hashSize) > 1 && 'services' | canI : 'update'\">Add a service to group them together.</span>\n" +
+    "<span ng-if=\"(services | hashSize) > 1 && ('services' | canI : 'update')\">Add a service to group them together.</span>\n" +
     "</p>\n" +
-    "<div ng-if=\"(services | hashSize) > 1 && 'services' | canI : 'update'\">\n" +
+    "<div ng-if=\"(services | hashSize) > 1 && ('services' | canI : 'update')\">\n" +
     "<button class=\"btn btn-primary\" ng-click=\"linkService()\">\n" +
     "Group Service\n" +
     "</button>\n" +