@@ -9003,7 +9003,7 @@ title:"Catalog",
9003
9003
link:"project/" + a.projectName + "/create?tab=fromCatalog"
9004
9004
}, {
9005
9005
title:d.displayName || y
9006
- } ], a.alerts = {};
9006
+ } ], a.alerts = {}, a.quotaAlerts = {} ;
9007
9007
var z = {
9008
9008
name:"app",
9009
9009
value:""
@@ -9155,7 +9155,7 @@ b.result.then(D);
9155
9155
var c = b.quotaAlerts || [], d = _.filter(c, {
9156
9156
type:"error"
9157
9157
});
9158
- a.nameTaken || d.length ? (a.disableInputs = !1, a.alerts = c) :c.length ? (E(c), a.disableInputs = !1) :D();
9158
+ a.nameTaken || d.length ? (a.disableInputs = !1, a.quotaAlerts = c) :c.length ? (E(c), a.disableInputs = !1) :D();
9159
9159
};
9160
9160
a.projectDisplayName = function() {
9161
9161
return w(this.project) || this.projectName;
@@ -9234,7 +9234,7 @@ d.unwatchAll(r);
9234
9234
} ]), angular.module("openshiftConsole").controller("NewFromTemplateController", [ "$scope", "$http", "$routeParams", "DataService", "ProcessedTemplateService", "AlertMessageService", "ProjectsService", "QuotaService", "$q", "$location", "TaskList", "$parse", "Navigate", "$filter", "$uibModal", "imageObjectRefFilter", "failureObjectNameFilter", "CachedTemplateService", "keyValueEditorUtils", "Constants", function(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
9235
9235
var u = c.template, v = c.namespace || "";
9236
9236
if (!u) return void m.toErrorPage("Cannot create from template: a template name was not specified.");
9237
- a.emptyMessage = "Loading...", a.alerts = {}, a.alertsTop = {}, a.projectName = c.project, a.projectPromise = $.Deferred(), a.labels = [], a.systemLabels = [], a.breadcrumbs = [ {
9237
+ a.emptyMessage = "Loading...", a.alerts = {}, a.quotaAlerts = {}, a.projectName = c.project, a.projectPromise = $.Deferred(), a.labels = [], a.systemLabels = [], a.breadcrumbs = [ {
9238
9238
title:a.projectName,
9239
9239
link:"project/" + a.projectName
9240
9240
}, {
@@ -9252,7 +9252,7 @@ var w = n("displayName"), x = n("humanize"), y = l("spec.template.spec.container
9252
9252
try {
9253
9253
return JSON.parse(c.templateParamsMap);
9254
9254
} catch (b) {
9255
- a.alertsTop .invalidTemplateParams = {
9255
+ a.alerts .invalidTemplateParams = {
9256
9256
type:"error",
9257
9257
message:"The templateParamsMap is not valid JSON. " + b
9258
9258
};
@@ -9412,7 +9412,7 @@ b.result.then(J);
9412
9412
var c = b.quotaAlerts || [], d = _.filter(c, {
9413
9413
type:"error"
9414
9414
});
9415
- d.length ? (a.disableInputs = !1, a.alerts = c) :c.length ? (K(c), a.disableInputs = !1) :J();
9415
+ d.length ? (a.disableInputs = !1, a.quotaAlerts = c) :c.length ? (K(c), a.disableInputs = !1) :J();
9416
9416
};
9417
9417
a.createFromTemplate = function() {
9418
9418
a.disableInputs = !0;
@@ -20715,6 +20715,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
20715
20715
"{{ emptyMessage }}\n" +
20716
20716
"</div>\n" +
20717
20717
"<div class=\"osc-form\" ng-show=\"imageStream\">\n" +
20718
+ "<alerts alerts=\"alerts\"></alerts>\n" +
20718
20719
"<div class=\"row\">\n" +
20719
20720
"<div class=\"col-md-2 icon hidden-sm hidden-xs\">\n" +
20720
20721
"<custom-icon resource=\"imageStream\" kind=\"image\" tag=\"imageTag\"></custom-icon>\n" +
@@ -20951,7 +20952,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
20951
20952
"<a href=\"\" ng-click=\"advancedOptions = !advancedOptions\" role=\"button\">advanced options</a>\n" +
20952
20953
"for source, routes, builds, and deployments.\n" +
20953
20954
"</div>\n" +
20954
- "<alerts alerts=\"alerts \"></alerts>\n" +
20955
+ "<alerts alerts=\"quotaAlerts \"></alerts>\n" +
20955
20956
"<div class=\"buttons gutter-bottom\" ng-class=\"{'gutter-top': !alerts.length}\">\n" +
20956
20957
"\n" +
20957
20958
"<button type=\"submit\" class=\"btn btn-primary btn-lg\" ng-disabled=\"form.$invalid || nameTaken || cpuProblems.length || memoryProblems.length || disableInputs\">Create</button>\n" +
@@ -26412,7 +26413,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
26412
26413
"{{ emptyMessage }}\n" +
26413
26414
"</div>\n" +
26414
26415
"<div class=\"osc-form\" ng-show=\"template\">\n" +
26415
- "<alerts alerts=\"alertsTop\" hide-close-button=\"true \"></alerts>\n" +
26416
+ "<alerts alerts=\"alerts \"></alerts>\n" +
26416
26417
"<div class=\"row\">\n" +
26417
26418
"<div class=\"col-md-2 icon hidden-sm hidden-xs\">\n" +
26418
26419
"<custom-icon resource=\"template\" kind=\"template\"></custom-icon>\n" +
@@ -26442,7 +26443,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
26442
26443
"<template-options parameters=\"template.parameters\" expand=\"true\" can-toggle=\"false\"></template-options>\n" +
26443
26444
"<label-editor labels=\"labels\" system-labels=\"systemLabels\" expand=\"true\" can-toggle=\"false\" help-text=\"Each label is applied to each created resource.\">\n" +
26444
26445
"</label-editor>\n" +
26445
- "<alerts alerts=\"alerts \"></alerts>\n" +
26446
+ "<alerts alerts=\"quotaAlerts \"></alerts>\n" +
26446
26447
"<div class=\"buttons gutter-top-bottom\">\n" +
26447
26448
"<button class=\"btn btn-primary btn-lg\" ng-click=\"createFromTemplate()\" ng-disabled=\"templateForm.$invalid || disableInputs\">Create</button>\n" +
26448
26449
"<a class=\"btn btn-default btn-lg\" href=\"{{projectName | projectOverviewURL}}\">Cancel</a>\n" +
0 commit comments