Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect projectName references #1702

Merged
merged 1 commit into from
Jun 14, 2017
Merged

Fix incorrect projectName references #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/directives/fromFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ angular.module("openshiftConsole")

$scope.cancel = function() {
hideErrorNotifications();
Navigate.toProjectOverview($scope.projectName);
Navigate.toProjectOverview($scope.project.metadata.name);
};

// Takes item that will be inspect kind field.
Expand Down
4 changes: 2 additions & 2 deletions app/views/directives/deploy-image.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from <strong>{{istag.namespace}}</strong>. You can grant authority with the command:

<p>
<code>oc policy add-role-to-user system:image-puller system:serviceaccount:{{projectName}}:default -n {{istag.namespace}}</code>
<code>oc policy add-role-to-user system:image-puller system:serviceaccount:{{project.metadata.name}}:default -n {{istag.namespace}}</code>
</p>
</div>
</fieldset>
Expand Down Expand Up @@ -149,7 +149,7 @@ <h2>
</div>
</div>
<osc-secrets model="pullSecrets"
namespace="projectName"
namespace="project.metadata.name"
display-type="pull"
type="image"
secrets-by-type="secretsByType"
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9275,7 +9275,7 @@ m.errorOccured || (1 === m.createResources.length && "Template" === m.resourceLi
});
}
}, m.cancel = function() {
E(), h.toProjectOverview(m.projectName);
E(), h.toProjectOverview(m.project.metadata.name);
};
var G = a("displayName");
m.$on("importFileFromYAMLOrJSON", m.create), m.$on("$destroy", E);
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6099,7 +6099,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
"Service account <strong>default</strong> will need image pull authority to deploy images from <strong>{{istag.namespace}}</strong>. You can grant authority with the command:\n" +
"<p>\n" +
"<code>oc policy add-role-to-user system:image-puller system:serviceaccount:{{projectName}}:default -n {{istag.namespace}}</code>\n" +
"<code>oc policy add-role-to-user system:image-puller system:serviceaccount:{{project.metadata.name}}:default -n {{istag.namespace}}</code>\n" +
"</p>\n" +
"</div>\n" +
"</fieldset>\n" +
Expand Down Expand Up @@ -6197,7 +6197,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<span class=\"help-block\">This name is already in use within the project. Please choose a different name.</span>\n" +
"</div>\n" +
"</div>\n" +
"<osc-secrets model=\"pullSecrets\" namespace=\"projectName\" display-type=\"pull\" type=\"image\" secrets-by-type=\"secretsByType\" service-account-to-link=\"default\" alerts=\"alerts\" allow-multiple-secrets=\"true\">\n" +
"<osc-secrets model=\"pullSecrets\" namespace=\"project.metadata.name\" display-type=\"pull\" type=\"image\" secrets-by-type=\"secretsByType\" service-account-to-link=\"default\" alerts=\"alerts\" allow-multiple-secrets=\"true\">\n" +
"</osc-secrets>\n" +
"<osc-form-section header=\"Environment Variables\" about-title=\"Environment Variables\" about=\"Environment variables are used to configure and pass information to running containers.\" expand=\"true\" can-toggle=\"false\" class=\"first-section\">\n" +
"<key-value-editor entries=\"env\" key-placeholder=\"Name\" key-validator=\"[A-Za-z_][A-Za-z0-9_]*\" key-validator-error=\"A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\" value-placeholder=\"Value\" value-from-selector-options=\"valueFromObjects\" add-row-link=\"Add Environment Variable\" add-row-with-selectors-link=\"Add Environment Variable Using a Config Map or Secret\"></key-value-editor>\n" +
Expand Down