Skip to content

Commit

Permalink
Merge pull request #1787 from spadgett/bump-catalog-common
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Jun 30, 2017
2 parents f46dc29 + 1283b22 commit 2b43d48
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 34 deletions.
1 change: 0 additions & 1 deletion app/scripts/controllers/createProject.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ angular.module('openshiftConsole')
Constants) {
var landingPageEnabled = _.get(Constants, 'ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page');

$scope.alerts = {};
$scope.onProjectCreated = function(encodedProjectName) {
if (landingPageEnabled) {
// If the new experience is enabled, return to project list.
Expand Down
3 changes: 1 addition & 2 deletions app/views/create-project.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<div class="container surface-shaded gutter-top">
<div class="col-md-12">
<h1>Create Project</h1>
<alerts alerts="alerts"></alerts>
<create-project alerts="alerts" redirect-action="onProjectCreated"></create-project>
<create-project redirect-action="onProjectCreated"></create-project>
</div>
</div>
</div><!-- /middle-content -->
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"angular-moment": "1.0.0",
"angular-utf8-base64": "0.0.5",
"file-saver": "1.3.3",
"origin-web-common": "0.0.39",
"origin-web-catalog": "0.0.27"
"origin-web-common": "0.0.41",
"origin-web-catalog": "0.0.29"
},
"devDependencies": {
"angular-mocks": "1.5.11",
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -8131,7 +8131,7 @@ a.canCreateProject = !1;
});
} ]), angular.module("openshiftConsole").controller("CreateProjectController", [ "$scope", "$location", "$window", "AuthService", "Constants", function(a, b, c, d, e) {
var f = _.get(e, "ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page");
a.alerts = {}, a.onProjectCreated = function(a) {
a.onProjectCreated = function(a) {
f ? c.history.back() :b.path("project/" + a + "/create");
}, d.withUser();
} ]), angular.module("openshiftConsole").controller("EditProjectController", [ "$scope", "$routeParams", "$filter", "$location", "DataService", "ProjectsService", "Navigate", function(a, b, c, d, e, f, g) {
Expand Down
3 changes: 1 addition & 2 deletions dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -4678,8 +4678,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"container surface-shaded gutter-top\">\n" +
"<div class=\"col-md-12\">\n" +
"<h1>Create Project</h1>\n" +
"<alerts alerts=\"alerts\"></alerts>\n" +
"<create-project alerts=\"alerts\" redirect-action=\"onProjectCreated\"></create-project>\n" +
"<create-project redirect-action=\"onProjectCreated\"></create-project>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down
53 changes: 28 additions & 25 deletions dist/scripts/vendor.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion dist/styles/main.css

Large diffs are not rendered by default.

0 comments on commit 2b43d48

Please sign in to comment.