Merge pull request #2196 from spadgett/remove-envFrom-deleted-secret

Merged by openshift-bot
openshift · Oct 2, 2017 · 9c144f3 · 9c144f3
2 parents 752a6ae + 1921ad3
commit 9c144f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/directives/edit-environment-from.html b/app/views/directives/edit-environment-from.html
@@ -52,7 +52,7 @@
         </div>
       </div>
 
-      <div ng-if="!$ctrl.isEnvFromReadonly(entry)" class="environment-from-editor-button">
+      <div ng-if="!$ctrl.isReadonlyAny && !entry.isReadonlyValue" class="environment-from-editor-button">
         <span
           ng-if="!$ctrl.cannotSort"
           class="fa fa-bars sort-row"

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -6681,7 +6681,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<div ng-if=\"!$ctrl.isEnvFromReadonly(entry)\" class=\"environment-from-editor-button\">\n" +
+    "<div ng-if=\"!$ctrl.isReadonlyAny && !entry.isReadonlyValue\" class=\"environment-from-editor-button\">\n" +
     "<span ng-if=\"!$ctrl.cannotSort\" class=\"fa fa-bars sort-row\" role=\"button\" aria-label=\"Move row\" aria-grabbed=\"false\" as-sortable-item-handle></span>\n" +
     "<a ng-if=\"!$ctrl.cannotDeleteAny\" href=\"\" class=\"pficon pficon-close delete-row as-sortable-item-delete\" role=\"button\" aria-label=\"Delete row\" ng-click=\"$ctrl.deleteEntry($index, 1)\"></a>\n" +
     "</div>\n" +