Skip to content

Commit 8e57c4b

Browse files
author
OpenShift Bot
committed
bump(github.com/openshift/origin-web-console): fa6f2af00717135ec5c8352daf73a3db2a4f4255
1 parent 4f1c538 commit 8e57c4b

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

pkg/assets/bindata.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9003,7 +9003,7 @@ title:"Catalog",
90039003
link:"project/" + a.projectName + "/create?tab=fromCatalog"
90049004
}, {
90059005
title:d.displayName || y
9006-
} ], a.alerts = {};
9006+
} ], a.alerts = {}, a.quotaAlerts = {};
90079007
var z = {
90089008
name:"app",
90099009
value:""
@@ -9155,7 +9155,7 @@ b.result.then(D);
91559155
var c = b.quotaAlerts || [], d = _.filter(c, {
91569156
type:"error"
91579157
});
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();
91599159
};
91609160
a.projectDisplayName = function() {
91619161
return w(this.project) || this.projectName;
@@ -9234,7 +9234,7 @@ d.unwatchAll(r);
92349234
} ]), 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) {
92359235
var u = c.template, v = c.namespace || "";
92369236
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 = [ {
92389238
title:a.projectName,
92399239
link:"project/" + a.projectName
92409240
}, {
@@ -9252,7 +9252,7 @@ var w = n("displayName"), x = n("humanize"), y = l("spec.template.spec.container
92529252
try {
92539253
return JSON.parse(c.templateParamsMap);
92549254
} catch (b) {
9255-
a.alertsTop.invalidTemplateParams = {
9255+
a.alerts.invalidTemplateParams = {
92569256
type:"error",
92579257
message:"The templateParamsMap is not valid JSON. " + b
92589258
};
@@ -9412,7 +9412,7 @@ b.result.then(J);
94129412
var c = b.quotaAlerts || [], d = _.filter(c, {
94139413
type:"error"
94149414
});
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();
94169416
};
94179417
a.createFromTemplate = function() {
94189418
a.disableInputs = !0;
@@ -20715,6 +20715,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
2071520715
"{{ emptyMessage }}\n" +
2071620716
"</div>\n" +
2071720717
"<div class=\"osc-form\" ng-show=\"imageStream\">\n" +
20718+
"<alerts alerts=\"alerts\"></alerts>\n" +
2071820719
"<div class=\"row\">\n" +
2071920720
"<div class=\"col-md-2 icon hidden-sm hidden-xs\">\n" +
2072020721
"<custom-icon resource=\"imageStream\" kind=\"image\" tag=\"imageTag\"></custom-icon>\n" +
@@ -20951,7 +20952,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
2095120952
"<a href=\"\" ng-click=\"advancedOptions = !advancedOptions\" role=\"button\">advanced options</a>\n" +
2095220953
"for source, routes, builds, and deployments.\n" +
2095320954
"</div>\n" +
20954-
"<alerts alerts=\"alerts\"></alerts>\n" +
20955+
"<alerts alerts=\"quotaAlerts\"></alerts>\n" +
2095520956
"<div class=\"buttons gutter-bottom\" ng-class=\"{'gutter-top': !alerts.length}\">\n" +
2095620957
"\n" +
2095720958
"<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', []
2641226413
"{{ emptyMessage }}\n" +
2641326414
"</div>\n" +
2641426415
"<div class=\"osc-form\" ng-show=\"template\">\n" +
26415-
"<alerts alerts=\"alertsTop\" hide-close-button=\"true\"></alerts>\n" +
26416+
"<alerts alerts=\"alerts\"></alerts>\n" +
2641626417
"<div class=\"row\">\n" +
2641726418
"<div class=\"col-md-2 icon hidden-sm hidden-xs\">\n" +
2641826419
"<custom-icon resource=\"template\" kind=\"template\"></custom-icon>\n" +
@@ -26442,7 +26443,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
2644226443
"<template-options parameters=\"template.parameters\" expand=\"true\" can-toggle=\"false\"></template-options>\n" +
2644326444
"<label-editor labels=\"labels\" system-labels=\"systemLabels\" expand=\"true\" can-toggle=\"false\" help-text=\"Each label is applied to each created resource.\">\n" +
2644426445
"</label-editor>\n" +
26445-
"<alerts alerts=\"alerts\"></alerts>\n" +
26446+
"<alerts alerts=\"quotaAlerts\"></alerts>\n" +
2644626447
"<div class=\"buttons gutter-top-bottom\">\n" +
2644726448
"<button class=\"btn btn-primary btn-lg\" ng-click=\"createFromTemplate()\" ng-disabled=\"templateForm.$invalid || disableInputs\">Create</button>\n" +
2644826449
"<a class=\"btn btn-default btn-lg\" href=\"{{projectName | projectOverviewURL}}\">Cancel</a>\n" +

0 commit comments

Comments
 (0)