Skip to content

Commit

Permalink
Update template annotations
Browse files Browse the repository at this point in the history
template.openshift.io/provider-display-name ->
openshift.io/provider-display-Name

template.openshift.io/documentation-url ->
openshift.io/documentation-url

template.openshift.io/support-url ->
openshift.io/support-url
  • Loading branch information
spadgett committed Oct 18, 2017
1 parent a7bc1f0 commit 5333e74
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions app/scripts/directives/fromFileDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
ctrl.template = message.template;
ctrl.iconClass = getIconClass();
ctrl.image = getImage();
ctrl.vendor = annotation(message.template, "template.openshift.io/provider-display-name");
ctrl.docUrl = annotation(ctrl.template, "template.openshift.io/documentation-url");
ctrl.supportUrl = annotation(ctrl.template, "template.openshift.io/support-url");
ctrl.vendor = annotation(message.template, "openshift.io/provider-display-name");
ctrl.docUrl = annotation(ctrl.template, "openshift.io/documentation-url");
ctrl.supportUrl = annotation(ctrl.template, "openshift.io/support-url");
ctrl.name = "YAML / JSON";
// Need to let the current digest loop finish so the template config step becomes visible or the wizard will throw an error
// from the change to currentStep
Expand Down
12 changes: 6 additions & 6 deletions app/scripts/directives/processTemplateDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@
initializeSteps();
ctrl.iconClass = getIconClass();
ctrl.image = getImage();
ctrl.docUrl = annotation(ctrl.template, "template.openshift.io/documentation-url");
ctrl.supportUrl = annotation(ctrl.template, "template.openshift.io/support-url");
ctrl.vendor = annotation(ctrl.template, "template.openshift.io/provider-display-name");
ctrl.docUrl = annotation(ctrl.template, "openshift.io/documentation-url");
ctrl.supportUrl = annotation(ctrl.template, "openshift.io/support-url");
ctrl.vendor = annotation(ctrl.template, "openshift.io/provider-display-name");
}
}
if (changes.useProjectTemplate) {
Expand Down Expand Up @@ -180,9 +180,9 @@
ctrl.selectStep.valid = !!template;
ctrl.iconClass = getIconClass();
ctrl.image = getImage();
ctrl.docUrl = annotation(ctrl.template, "template.openshift.io/documentation-url");
ctrl.supportUrl = annotation(ctrl.template, "template.openshift.io/support-url");
ctrl.vendor = annotation(ctrl.template, "template.openshift.io/provider-display-name");
ctrl.docUrl = annotation(ctrl.template, "openshift.io/documentation-url");
ctrl.supportUrl = annotation(ctrl.template, "openshift.io/support-url");
ctrl.vendor = annotation(ctrl.template, "openshift.io/provider-display-name");
};

ctrl.templateProjectChange = function () {
Expand Down
6 changes: 3 additions & 3 deletions dist/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -13196,7 +13196,7 @@ appliedFilters: [],
onFilterChange: g
}, n.project || (b.showProjectName = !0);
}, b.$onChanges = function(e) {
e.template && b.template && (d(), b.iconClass = l(), b.image = u(), b.docUrl = S(b.template, "template.openshift.io/documentation-url"), b.supportUrl = S(b.template, "template.openshift.io/support-url"), b.vendor = S(b.template, "template.openshift.io/provider-display-name")), e.useProjectTemplate && d();
e.template && b.template && (d(), b.iconClass = l(), b.image = u(), b.docUrl = S(b.template, "openshift.io/documentation-url"), b.supportUrl = S(b.template, "openshift.io/support-url"), b.vendor = S(b.template, "openshift.io/provider-display-name")), e.useProjectTemplate && d();
}, e.$on("templateInstantiated", function(e, t) {
b.selectedProject = t.project, b.currentStep = b.resultsStep.label;
}), b.$onDestroy = function() {
Expand All @@ -13209,7 +13209,7 @@ _.isFunction(e) && e();
}, b.onProjectSelected = function(t) {
b.selectedProject = t, b.configStep.valid = e.$ctrl.form.$valid && b.selectedProject;
}, b.templateSelected = function(e) {
b.selectedTemplate = e, b.template = _.get(e, "resource"), b.selectStep.valid = !!e, b.iconClass = l(), b.image = u(), b.docUrl = S(b.template, "template.openshift.io/documentation-url"), b.supportUrl = S(b.template, "template.openshift.io/support-url"), b.vendor = S(b.template, "template.openshift.io/provider-display-name");
b.selectedTemplate = e, b.template = _.get(e, "resource"), b.selectStep.valid = !!e, b.iconClass = l(), b.image = u(), b.docUrl = S(b.template, "openshift.io/documentation-url"), b.supportUrl = S(b.template, "openshift.io/support-url"), b.vendor = S(b.template, "openshift.io/provider-display-name");
}, b.templateProjectChange = function() {
b.templateProjectName = _.get(b.templateProject, "metadata.name"), b.catalogItems = {}, b.templateSelected(), a.getProjectCatalogItems(b.templateProjectName, !1, !0).then(_.spread(function(e, t) {
b.catalogItems = e, b.totalCount = b.catalogItems.length, g(), t && i.addNotification({
Expand Down Expand Up @@ -13278,7 +13278,7 @@ e.$broadcast("importFileFromYAMLOrJSON");
}, s.instantiateTemplate = function() {
e.$broadcast("instantiateTemplate");
}, e.$on("fileImportedFromYAMLOrJSON", function(e, n) {
s.selectedProject = n.project, s.template = n.template, s.iconClass = o(), s.image = i(), s.vendor = c(n.template, "template.openshift.io/provider-display-name"), s.docUrl = c(s.template, "template.openshift.io/documentation-url"), s.supportUrl = c(s.template, "template.openshift.io/support-url"), s.name = "YAML / JSON", t(function() {
s.selectedProject = n.project, s.template = n.template, s.iconClass = o(), s.image = i(), s.vendor = c(n.template, "openshift.io/provider-display-name"), s.docUrl = c(s.template, "openshift.io/documentation-url"), s.supportUrl = c(s.template, "openshift.io/support-url"), s.name = "YAML / JSON", t(function() {
s.currentStep = s.template ? "Template Configuration" : "Results";
}, 0);
}), e.$on("templateInstantiated", function(e, t) {
Expand Down

0 comments on commit 5333e74

Please sign in to comment.