Merge pull request #1839 from spadgett/apps-group-edit-yaml

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/filters/canI.js

@@ -17,6 +17,7 @@ angular
       ],
       'deployments': [
         {group: 'autoscaling', resource: 'horizontalpodautoscalers', verbs: ['create', 'update']},
+        {group: 'apps',        resource: 'deployments',              verbs: ['update']},
         {group: 'extensions',  resource: 'deployments',              verbs: ['create', 'update']}
       ],
       'deploymentConfigs': [

app/views/browse/deployment.html

@@ -47,8 +47,13 @@ <h1 class="contains-actions">
                   <li ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'">
                     <a ng-href="{{healthCheckURL}}" role="button">Edit Health Checks</a>
                   </li>
-                  <li ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'">
-                    <a ng-href="{{deployment | editYamlURL}}" role="button">Edit YAML</a>
+                  <!--
+                    Edit YAML of `apps` group so that the user can modify the latest API fields.
+                    This can be switched back to use the `editYamlURL` filter when we've migrated
+                    the rest of the web console to use the `apps` group for deployments.
+                  -->
+                  <li ng-if="{ group: 'apps', resource: 'deployments' } | canI : 'update'">
+                    <a ng-href="project/{{projectName}}/edit/yaml?kind=Deployment&group=apps&name={{deployment.metadata.name}}" role="button">Edit YAML</a>
                   </li>
                   <li class="divider" ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'"></li>
                   <li ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'delete'">

dist/scripts/scripts.js

@@ -14506,6 +14506,10 @@ group:"autoscaling",
 resource:"horizontalpodautoscalers",
 verbs:[ "create", "update" ]
 }, {
+group:"apps",
+resource:"deployments",
+verbs:[ "update" ]
+}, {
 group:"extensions",
 resource:"deployments",
 verbs:[ "create", "update" ]

dist/scripts/templates.js

@@ -2677,8 +2677,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<li ng-if=\"{ group: 'extensions', resource: 'deployments' } | canI : 'update'\">\n" +
     "<a ng-href=\"{{healthCheckURL}}\" role=\"button\">Edit Health Checks</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"{ group: 'extensions', resource: 'deployments' } | canI : 'update'\">\n" +
-    "<a ng-href=\"{{deployment | editYamlURL}}\" role=\"button\">Edit YAML</a>\n" +
+    "\n" +
+    "<li ng-if=\"{ group: 'apps', resource: 'deployments' } | canI : 'update'\">\n" +
+    "<a ng-href=\"project/{{projectName}}/edit/yaml?kind=Deployment&group=apps&name={{deployment.metadata.name}}\" role=\"button\">Edit YAML</a>\n" +
     "</li>\n" +
     "<li class=\"divider\" ng-if=\"{ group: 'extensions', resource: 'deployments' } | canI : 'update'\"></li>\n" +
     "<li ng-if=\"{ group: 'extensions', resource: 'deployments' } | canI : 'delete'\">\n" +