Merge pull request #2902 from spadgett/edit-env-var-msg

Automatic merge from submit-queue. Bug 1477133 - Show link to owner on pod env tab Link to the env tab of the owning resource. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1477133 /assign @benjaminapetersen
openshift · Mar 19, 2018 · 327c51a · 327c51a
2 parents efea731 + e9dc498
commit 327c51a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/app/views/browse/pod.html b/app/views/browse/pod.html
@@ -53,6 +53,16 @@ <h1 class="contains-actions">
             </uib-tab>
             <uib-tab heading="Environment" active="selectedTab.environment">
               <uib-tab-heading>Environment</uib-tab-heading>
+              <p ng-if="dcName">
+                <span class="pficon pficon-info" aria-hidden="true"></span>
+                Environment variables can be edited on deployment config
+                <a ng-href="{{dcName | navigateResourceURL : 'DeploymentConfig' : pod.metadata.namespace}}?tab=environment">{{dcName}}</a>.
+              </p>
+              <p ng-if="!dcName && controllerRef">
+                <span class="pficon pficon-info" aria-hidden="true"></span>
+                Environment variables were set by {{controllerRef.kind | humanizeKind}}
+                <a ng-href="{{controllerRef.name | navigateResourceURL : controllerRef.kind : pod.metadata.namespace}}?tab=environment">{{controllerRef.name}}</a>.
+              </p>
               <edit-environment-variables api-object="pod" ng-readonly="true"></edit-environment-variables>
             </uib-tab>
             <uib-tab ng-if="metricsAvailable" heading="Metrics" active="selectedTab.metrics">

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -3036,6 +3036,16 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</uib-tab>\n" +
     "<uib-tab heading=\"Environment\" active=\"selectedTab.environment\">\n" +
     "<uib-tab-heading>Environment</uib-tab-heading>\n" +
+    "<p ng-if=\"dcName\">\n" +
+    "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
+    "Environment variables can be edited on deployment config\n" +
+    "<a ng-href=\"{{dcName | navigateResourceURL : 'DeploymentConfig' : pod.metadata.namespace}}?tab=environment\">{{dcName}}</a>.\n" +
+    "</p>\n" +
+    "<p ng-if=\"!dcName && controllerRef\">\n" +
+    "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
+    "Environment variables were set by {{controllerRef.kind | humanizeKind}}\n" +
+    "<a ng-href=\"{{controllerRef.name | navigateResourceURL : controllerRef.kind : pod.metadata.namespace}}?tab=environment\">{{controllerRef.name}}</a>.\n" +
+    "</p>\n" +
     "<edit-environment-variables api-object=\"pod\" ng-readonly=\"true\"></edit-environment-variables>\n" +
     "</uib-tab>\n" +
     "<uib-tab ng-if=\"metricsAvailable\" heading=\"Metrics\" active=\"selectedTab.metrics\">\n" +