diff --git a/assets/app/scripts/controllers/projects.js b/assets/app/scripts/controllers/projects.js index 7f991003cbcc..35405a5bb841 100644 --- a/assets/app/scripts/controllers/projects.js +++ b/assets/app/scripts/controllers/projects.js @@ -16,7 +16,7 @@ angular.module('openshiftConsole') AuthService.withUser().then(function() { DataService.list("projects", $scope, function(projects) { $scope.projects = projects.by("metadata.name"); - $scope.emptyMessage = "You have no projects. For an example, run openshift cli create -f https://raw.githubusercontent.com/openshift/origin/master/examples/sample-app/project.json"; + $scope.emptyMessage = "No projects to show."; }); }); diff --git a/assets/app/views/projects.html b/assets/app/views/projects.html index 54da878ba43f..f5e938fe8978 100644 --- a/assets/app/views/projects.html +++ b/assets/app/views/projects.html @@ -1,12 +1,16 @@

Projects

-
-
-

{{project.displayName || project.metadata.name}}

{{project | annotation : 'description'}}
+
{{emptyMessage}}
+
+ To create a new project, run openshift ex new-project <projectname> --admin={{user.metadata.name || '<YourUsername>'}} +
+
+ To be added as an admin to an existing project, run openshift ex policy add-user admin {{user.metadata.name || '<YourUsername>'}} -n <projectname> +
diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index b3ff9763934e..3ede94d2a634 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -252,3 +252,11 @@ openshift ex policy add-user cluster-admin system:no-user openshift ex policy remove-user cluster-admin system:no-user openshift ex policy remove-user-from-project system:no-user echo "ex policy: ok" + +# Test the commands the UI projects page tells users to run +# These should match what is described in projects.html +openshift ex new-project ui-test-project --admin="anypassword:createuser" +openshift ex policy add-user admin anypassword:adduser -n ui-test-project +osc describe policybinding master -n ui-test-project | grep createuser +osc describe policybinding master -n ui-test-project | grep adduser +echo "UI project commands: ok" diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go index 91b7d18792b5..41b1f745391a 100644 --- a/pkg/assets/bindata.go +++ b/pkg/assets/bindata.go @@ -13288,7 +13288,7 @@ this._labelFilterRootElement && (a ? this._labelFilterRootElement.show() :this._ } ]), angular.module("openshiftConsole").controller("ProjectsController", [ "$scope", "$location", "DataService", "AuthService", function(a, b, c, d) { a.projects = {}, a.alerts = a.alerts || {}, a.emptyMessage = "Loading...", d.withUser().then(function() { c.list("projects", a, function(b) { -a.projects = b.by("metadata.name"), a.emptyMessage = "You have no projects. For an example, run openshift cli create -f https://raw.githubusercontent.com/openshift/origin/master/examples/sample-app/project.json"; +a.projects = b.by("metadata.name"), a.emptyMessage = "No projects to show."; }); }), a.tileClickHandler = function(a) { var c = $(a.target); @@ -56069,13 +56069,17 @@ func views_project_html() ([]byte, error) { var _views_projects_html = []byte(`

Projects

-
-
-

{{project.displayName || project.metadata.name}}

{{project | annotation : 'description'}}
+
{{emptyMessage}}
+
+To create a new project, run openshift ex new-project <projectname> --admin={{user.metadata.name || '<YourUsername>'}} +
+
+To be added as an admin to an existing project, run openshift ex policy add-user admin {{user.metadata.name || '<YourUsername>'}} -n <projectname> +
`)