From f8d53b3a12d1184e327d077bf4d6a6aed077e99f Mon Sep 17 00:00:00 2001 From: adrian-turjak Date: Wed, 17 May 2017 12:54:54 +1200 Subject: [PATCH] Renaming StackTask to Adjutant * This is just a search and replace. * No functional changes. Change-Id: Id03ae0cb572df127a590e2631c3fb4888b34ac84 --- .gitreview | 2 +- MANIFEST.in | 12 +++++----- README.rst | 20 ++++++++--------- {stacktask_ui => adjutant_ui}/__init__.py | 0 {stacktask_ui => adjutant_ui}/api/__init__.py | 0 .../api/adjutant.py | 0 .../content/__init__.py | 0 .../content/default/__init__.py | 0 .../content/default/panel.py | 2 +- .../default/templates/default/base.html | 0 .../content/forgot_password/__init__.py | 0 .../content/forgot_password/forms.py | 4 ++-- .../content/forgot_password/panel.py | 0 .../templates/auth/_login_page.html | 0 .../_forgot_password_form.html | 0 .../templates/forgot_password/_index.html | 0 .../templates/forgot_password/_sent.html | 0 .../templates/forgot_password/_sent_text.html | 0 .../templates/forgot_password/index.html | 0 .../templates/forgot_password/sent.html | 0 .../content/forgot_password/urls.py | 2 +- .../content/forgot_password/views.py | 2 +- .../content/project_users/__init__.py | 0 .../content/project_users/forms.py | 16 +++++++------- .../content/project_users/panel.py | 0 .../content/project_users/tables.py | 12 +++++----- .../templates/project_users/_invite.html | 0 .../templates/project_users/_update.html | 0 .../templates/project_users/index.html | 0 .../templates/project_users/invite.html | 0 .../templates/project_users/update.html | 0 .../content/project_users/urls.py | 2 +- .../content/project_users/utils.py | 0 .../content/project_users/views.py | 10 ++++----- .../content/tasks/__init__.py | 0 .../content/tasks/forms.py | 4 ++-- .../content/tasks/panel.py | 0 .../content/tasks/tables.py | 6 ++--- .../content/tasks/tabs.py | 6 ++--- .../templates/tasks/_task_detail_actions.html | 0 .../templates/tasks/_task_detail_notes.html | 0 .../tasks/_task_detail_overview.html | 0 .../tasks/templates/tasks/_update.html | 0 .../content/tasks/templates/tasks/index.html | 0 .../content/tasks/templates/tasks/update.html | 0 .../content/tasks/templatetags/__init__.py | 0 .../tasks/templatetags/task_filters.py | 0 .../content/tasks/urls.py | 2 +- .../content/tasks/views.py | 16 +++++++------- .../content/token/__init__.py | 0 .../content/token/forms.py | 0 .../content/token/panel.py | 2 +- .../token/templates/token/_setpassword.html | 0 .../templates/token/_setpassword_form.html | 0 .../token/templates/token/_tokenconfirm.html | 0 .../templates/token/_tokenconfirm_form.html | 0 .../token/templates/token/setpassword.html | 0 .../token/templates/token/tokenconfirm.html | 0 .../content/token/urls.py | 2 +- .../content/token/views.py | 18 +++++++-------- .../dashboards/__init__.py | 0 .../dashboards/forgot_password_dash.py | 2 +- .../dashboards/management.py | 2 +- .../dashboards/token_dash.py | 2 +- .../enabled/_6000_management.py | 2 +- .../enabled/_6001_adjutant_base.py | 6 ++--- .../enabled/_6010_token.py | 4 ++-- .../enabled/_6015_forgot_password.py | 4 ++-- .../_6020_management_access_control_group.py | 0 .../enabled/_6021_management_project_users.py | 2 +- .../enabled/_6090_management_task_list.py | 4 ++-- .../enabled/__init__.py | 0 {stacktask_ui => adjutant_ui}/karma.conf.js | 0 .../templates/auth/_login_page.html | 0 .../templatetags/__init__.py | 0 .../templatetags/relabel_username_field.py | 0 .../test/__init__.py | 0 .../test/api_tests/__init__.py | 0 .../test/api_tests/rest_api_tests.py | 2 +- {stacktask_ui => adjutant_ui}/test/helpers.py | 2 +- .../test/integration_tests/__init__.py | 0 .../test/settings.py | 6 ++--- .../test/test_data.py | 0 {stacktask_ui => adjutant_ui}/version.py | 2 +- doc/source/conf.py | 16 +++++++------- doc/source/index.rst | 18 +++++++-------- doc/source/releases/0.1.0.rst | 2 +- run_tests.sh | 22 +++++++++---------- setup.cfg | 8 +++---- tox.ini | 4 ++-- 90 files changed, 125 insertions(+), 125 deletions(-) rename {stacktask_ui => adjutant_ui}/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/api/__init__.py (100%) rename stacktask_ui/api/stacktask.py => adjutant_ui/api/adjutant.py (100%) rename {stacktask_ui => adjutant_ui}/content/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/content/default/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/content/default/panel.py (93%) rename {stacktask_ui => adjutant_ui}/content/default/templates/default/base.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/forms.py (95%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/panel.py (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/templates/auth/_login_page.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/templates/forgot_password/_forgot_password_form.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/templates/forgot_password/_index.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/templates/forgot_password/_sent.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/templates/forgot_password/_sent_text.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/templates/forgot_password/index.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/templates/forgot_password/sent.html (100%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/urls.py (94%) rename {stacktask_ui => adjutant_ui}/content/forgot_password/views.py (93%) rename {stacktask_ui => adjutant_ui}/content/project_users/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/forms.py (91%) rename {stacktask_ui => adjutant_ui}/content/project_users/panel.py (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/tables.py (94%) rename {stacktask_ui => adjutant_ui}/content/project_users/templates/project_users/_invite.html (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/templates/project_users/_update.html (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/templates/project_users/index.html (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/templates/project_users/invite.html (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/templates/project_users/update.html (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/urls.py (94%) rename {stacktask_ui => adjutant_ui}/content/project_users/utils.py (100%) rename {stacktask_ui => adjutant_ui}/content/project_users/views.py (91%) rename {stacktask_ui => adjutant_ui}/content/tasks/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/forms.py (95%) rename {stacktask_ui => adjutant_ui}/content/tasks/panel.py (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/tables.py (97%) rename {stacktask_ui => adjutant_ui}/content/tasks/tabs.py (96%) rename {stacktask_ui => adjutant_ui}/content/tasks/templates/tasks/_task_detail_actions.html (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/templates/tasks/_task_detail_notes.html (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/templates/tasks/_task_detail_overview.html (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/templates/tasks/_update.html (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/templates/tasks/index.html (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/templates/tasks/update.html (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/templatetags/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/templatetags/task_filters.py (100%) rename {stacktask_ui => adjutant_ui}/content/tasks/urls.py (95%) rename {stacktask_ui => adjutant_ui}/content/tasks/views.py (87%) rename {stacktask_ui => adjutant_ui}/content/token/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/content/token/forms.py (100%) rename {stacktask_ui => adjutant_ui}/content/token/panel.py (94%) rename {stacktask_ui => adjutant_ui}/content/token/templates/token/_setpassword.html (100%) rename {stacktask_ui => adjutant_ui}/content/token/templates/token/_setpassword_form.html (100%) rename {stacktask_ui => adjutant_ui}/content/token/templates/token/_tokenconfirm.html (100%) rename {stacktask_ui => adjutant_ui}/content/token/templates/token/_tokenconfirm_form.html (100%) rename {stacktask_ui => adjutant_ui}/content/token/templates/token/setpassword.html (100%) rename {stacktask_ui => adjutant_ui}/content/token/templates/token/tokenconfirm.html (100%) rename {stacktask_ui => adjutant_ui}/content/token/urls.py (94%) rename {stacktask_ui => adjutant_ui}/content/token/views.py (89%) rename {stacktask_ui => adjutant_ui}/dashboards/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/dashboards/forgot_password_dash.py (94%) rename {stacktask_ui => adjutant_ui}/dashboards/management.py (94%) rename {stacktask_ui => adjutant_ui}/dashboards/token_dash.py (95%) rename {stacktask_ui => adjutant_ui}/enabled/_6000_management.py (81%) rename stacktask_ui/enabled/_6001_stacktask_base.py => adjutant_ui/enabled/_6001_adjutant_base.py (60%) rename {stacktask_ui => adjutant_ui}/enabled/_6010_token.py (70%) rename {stacktask_ui => adjutant_ui}/enabled/_6015_forgot_password.py (68%) rename {stacktask_ui => adjutant_ui}/enabled/_6020_management_access_control_group.py (100%) rename {stacktask_ui => adjutant_ui}/enabled/_6021_management_project_users.py (82%) rename {stacktask_ui => adjutant_ui}/enabled/_6090_management_task_list.py (79%) rename {stacktask_ui => adjutant_ui}/enabled/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/karma.conf.js (100%) rename {stacktask_ui => adjutant_ui}/templates/auth/_login_page.html (100%) rename {stacktask_ui => adjutant_ui}/templatetags/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/templatetags/relabel_username_field.py (100%) rename {stacktask_ui => adjutant_ui}/test/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/test/api_tests/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/test/api_tests/rest_api_tests.py (95%) rename {stacktask_ui => adjutant_ui}/test/helpers.py (91%) rename {stacktask_ui => adjutant_ui}/test/integration_tests/__init__.py (100%) rename {stacktask_ui => adjutant_ui}/test/settings.py (92%) rename {stacktask_ui => adjutant_ui}/test/test_data.py (100%) rename {stacktask_ui => adjutant_ui}/version.py (91%) diff --git a/.gitreview b/.gitreview index 71beb1d..e6ea880 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,5 @@ [gerrit] host=gerrit.dmz.wgtn.cat-it.co.nz port=29418 -project=openstack-stacktask-ui.git +project=openstack-adjutant-ui.git defaultbranch=master diff --git a/MANIFEST.in b/MANIFEST.in index 4ee60e5..f507731 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,8 @@ include setup.py -recursive-include stacktask_ui/content/default/templates * -recursive-include stacktask_ui/content/forgotpassword/templates * -recursive-include stacktask_ui/content/project_users/templates * -recursive-include stacktask_ui/content/tasks/templates * -recursive-include stacktask_ui/content/token/templates * -recursive-include stacktask_ui/static * +recursive-include adjutant_ui/content/default/templates * +recursive-include adjutant_ui/content/forgotpassword/templates * +recursive-include adjutant_ui/content/project_users/templates * +recursive-include adjutant_ui/content/tasks/templates * +recursive-include adjutant_ui/content/token/templates * +recursive-include adjutant_ui/static * diff --git a/README.rst b/README.rst index e0a680a..b21bdcc 100644 --- a/README.rst +++ b/README.rst @@ -1,19 +1,19 @@ ============ -stacktask-ui +adjutant-ui ============ -StackTask Dashboard +Adjutant Dashboard * Free software: Apache license -* Source: https://github.com/catalyst/stacktask-ui +* Source: https://github.com/catalyst/adjutant-ui Manual Installation ------------------- -Begin by cloning the Horizon and StackTask UI repositories:: +Begin by cloning the Horizon and Adjutant UI repositories:: git clone https://github.com/openstack/horizon - git clone https://github.com/catalyst/stacktask-ui + git clone https://github.com/catalyst/adjutant-ui Create a virtual environment and install Horizon dependencies:: @@ -33,7 +33,7 @@ editor. You will want to customize several settings: environment. (They should be correct unless you modified your OpenStack server to change them.) - ``OPENSTACK_REGISTRATION_URL`` should also be configured to point to - you StackTask server and version. + you Adjutant server and version. You will also need to update the ``keystone_policy.json`` file (openstack_dashboard/conf/keystone_policy.json) in horizon with the following lines:: @@ -44,15 +44,15 @@ the following lines:: "project_admin_only": "rule:admin_required or rule:project_admin", "identity:project_users_access": "rule:project_mod_or_admin", -Install StackTask UI with all dependencies in your virtual environment:: +Install Adjutant UI with all dependencies in your virtual environment:: - tools/with_venv.sh pip install -e ../stacktask-ui/ + tools/with_venv.sh pip install -e ../adjutant-ui/ And enable it in Horizon:: - cp ../stacktask-ui/stacktask-ui/enabled/_* openstack_dashboard/local/enabled + cp ../adjutant-ui/adjutant-ui/enabled/_* openstack_dashboard/local/enabled -To run horizon with the newly enabled StackTask UI plugin run:: +To run horizon with the newly enabled Adjutant UI plugin run:: ./run_tests.sh --runserver 0.0.0.0:8080 diff --git a/stacktask_ui/__init__.py b/adjutant_ui/__init__.py similarity index 100% rename from stacktask_ui/__init__.py rename to adjutant_ui/__init__.py diff --git a/stacktask_ui/api/__init__.py b/adjutant_ui/api/__init__.py similarity index 100% rename from stacktask_ui/api/__init__.py rename to adjutant_ui/api/__init__.py diff --git a/stacktask_ui/api/stacktask.py b/adjutant_ui/api/adjutant.py similarity index 100% rename from stacktask_ui/api/stacktask.py rename to adjutant_ui/api/adjutant.py diff --git a/stacktask_ui/content/__init__.py b/adjutant_ui/content/__init__.py similarity index 100% rename from stacktask_ui/content/__init__.py rename to adjutant_ui/content/__init__.py diff --git a/stacktask_ui/content/default/__init__.py b/adjutant_ui/content/default/__init__.py similarity index 100% rename from stacktask_ui/content/default/__init__.py rename to adjutant_ui/content/default/__init__.py diff --git a/stacktask_ui/content/default/panel.py b/adjutant_ui/content/default/panel.py similarity index 93% rename from stacktask_ui/content/default/panel.py rename to adjutant_ui/content/default/panel.py index 63d4cfb..1f2a464 100644 --- a/stacktask_ui/content/default/panel.py +++ b/adjutant_ui/content/default/panel.py @@ -20,5 +20,5 @@ import horizon class Default(horizon.Panel): name = _("Default") slug = 'default' - urls = 'stacktask_ui.content.project_users.urls' + urls = 'adjutant_ui.content.project_users.urls' nav = False diff --git a/stacktask_ui/content/default/templates/default/base.html b/adjutant_ui/content/default/templates/default/base.html similarity index 100% rename from stacktask_ui/content/default/templates/default/base.html rename to adjutant_ui/content/default/templates/default/base.html diff --git a/stacktask_ui/content/forgot_password/__init__.py b/adjutant_ui/content/forgot_password/__init__.py similarity index 100% rename from stacktask_ui/content/forgot_password/__init__.py rename to adjutant_ui/content/forgot_password/__init__.py diff --git a/stacktask_ui/content/forgot_password/forms.py b/adjutant_ui/content/forgot_password/forms.py similarity index 95% rename from stacktask_ui/content/forgot_password/forms.py rename to adjutant_ui/content/forgot_password/forms.py index c5f4208..f75a4d6 100644 --- a/stacktask_ui/content/forgot_password/forms.py +++ b/adjutant_ui/content/forgot_password/forms.py @@ -20,7 +20,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import forms as hforms from horizon.utils import functions as utils -from stacktask_ui.api import stacktask +from adjutant_ui.api import adjutant # Username is ignored, use email address instead. USERNAME_IS_EMAIL = True @@ -45,7 +45,7 @@ class ForgotPasswordForm(hforms.SelfHandlingForm): def handle(self, request, data): try: - submit_response = stacktask.forgotpassword_submit( + submit_response = adjutant.forgotpassword_submit( request, data) if submit_response.ok: return True diff --git a/stacktask_ui/content/forgot_password/panel.py b/adjutant_ui/content/forgot_password/panel.py similarity index 100% rename from stacktask_ui/content/forgot_password/panel.py rename to adjutant_ui/content/forgot_password/panel.py diff --git a/stacktask_ui/content/forgot_password/templates/auth/_login_page.html b/adjutant_ui/content/forgot_password/templates/auth/_login_page.html similarity index 100% rename from stacktask_ui/content/forgot_password/templates/auth/_login_page.html rename to adjutant_ui/content/forgot_password/templates/auth/_login_page.html diff --git a/stacktask_ui/content/forgot_password/templates/forgot_password/_forgot_password_form.html b/adjutant_ui/content/forgot_password/templates/forgot_password/_forgot_password_form.html similarity index 100% rename from stacktask_ui/content/forgot_password/templates/forgot_password/_forgot_password_form.html rename to adjutant_ui/content/forgot_password/templates/forgot_password/_forgot_password_form.html diff --git a/stacktask_ui/content/forgot_password/templates/forgot_password/_index.html b/adjutant_ui/content/forgot_password/templates/forgot_password/_index.html similarity index 100% rename from stacktask_ui/content/forgot_password/templates/forgot_password/_index.html rename to adjutant_ui/content/forgot_password/templates/forgot_password/_index.html diff --git a/stacktask_ui/content/forgot_password/templates/forgot_password/_sent.html b/adjutant_ui/content/forgot_password/templates/forgot_password/_sent.html similarity index 100% rename from stacktask_ui/content/forgot_password/templates/forgot_password/_sent.html rename to adjutant_ui/content/forgot_password/templates/forgot_password/_sent.html diff --git a/stacktask_ui/content/forgot_password/templates/forgot_password/_sent_text.html b/adjutant_ui/content/forgot_password/templates/forgot_password/_sent_text.html similarity index 100% rename from stacktask_ui/content/forgot_password/templates/forgot_password/_sent_text.html rename to adjutant_ui/content/forgot_password/templates/forgot_password/_sent_text.html diff --git a/stacktask_ui/content/forgot_password/templates/forgot_password/index.html b/adjutant_ui/content/forgot_password/templates/forgot_password/index.html similarity index 100% rename from stacktask_ui/content/forgot_password/templates/forgot_password/index.html rename to adjutant_ui/content/forgot_password/templates/forgot_password/index.html diff --git a/stacktask_ui/content/forgot_password/templates/forgot_password/sent.html b/adjutant_ui/content/forgot_password/templates/forgot_password/sent.html similarity index 100% rename from stacktask_ui/content/forgot_password/templates/forgot_password/sent.html rename to adjutant_ui/content/forgot_password/templates/forgot_password/sent.html diff --git a/stacktask_ui/content/forgot_password/urls.py b/adjutant_ui/content/forgot_password/urls.py similarity index 94% rename from stacktask_ui/content/forgot_password/urls.py rename to adjutant_ui/content/forgot_password/urls.py index 1a32a51..e34eabc 100644 --- a/stacktask_ui/content/forgot_password/urls.py +++ b/adjutant_ui/content/forgot_password/urls.py @@ -15,7 +15,7 @@ from django.conf.urls import patterns from django.conf.urls import url -from stacktask_ui.content.forgot_password import views +from adjutant_ui.content.forgot_password import views # NOTE(adriant): These urls are registered in the project_users urls.py file. urlpatterns = patterns( diff --git a/stacktask_ui/content/forgot_password/views.py b/adjutant_ui/content/forgot_password/views.py similarity index 93% rename from stacktask_ui/content/forgot_password/views.py rename to adjutant_ui/content/forgot_password/views.py index 86e8028..787c596 100644 --- a/stacktask_ui/content/forgot_password/views.py +++ b/adjutant_ui/content/forgot_password/views.py @@ -16,7 +16,7 @@ from django.shortcuts import render from horizon import forms -from stacktask_ui.content.forgot_password import forms as fp_forms +from adjutant_ui.content.forgot_password import forms as fp_forms class ForgotPasswordView(forms.ModalFormView): diff --git a/stacktask_ui/content/project_users/__init__.py b/adjutant_ui/content/project_users/__init__.py similarity index 100% rename from stacktask_ui/content/project_users/__init__.py rename to adjutant_ui/content/project_users/__init__.py diff --git a/stacktask_ui/content/project_users/forms.py b/adjutant_ui/content/project_users/forms.py similarity index 91% rename from stacktask_ui/content/project_users/forms.py rename to adjutant_ui/content/project_users/forms.py index cd902c7..6c44680 100644 --- a/stacktask_ui/content/project_users/forms.py +++ b/adjutant_ui/content/project_users/forms.py @@ -20,8 +20,8 @@ from horizon import exceptions from horizon import forms from horizon import messages -from stacktask_ui.api import stacktask -from stacktask_ui.content.project_users import utils +from adjutant_ui.api import adjutant +from adjutant_ui.content.project_users import utils def get_role_choices(request): @@ -30,7 +30,7 @@ def get_role_choices(request): Returns a list of sorted 2-ary tuples containing the roles the current user can manage. """ - role_names = stacktask.valid_role_names_get(request) + role_names = adjutant.valid_role_names_get(request) role_tuples = [(r, utils.get_role_text(r)) for r in role_names] role_tuples = sorted(role_tuples, key=lambda role: role[1]) return role_tuples @@ -56,7 +56,7 @@ class InviteUserForm(forms.SelfHandlingForm): def handle(self, request, data): try: - response = stacktask.user_invite(request, data) + response = adjutant.user_invite(request, data) if response.status_code == 200: messages.success(request, _('Invited user successfully.')) else: @@ -91,10 +91,10 @@ class UpdateUserForm(forms.SelfHandlingForm): # Submit each list to the api (add first?) try: user_id = data['id'] - current_user = stacktask.user_get(request, user_id) + current_user = adjutant.user_get(request, user_id) current_roles = set(current_user['roles']) managable_roles = set( - stacktask.valid_role_names_get(request)) + adjutant.valid_role_names_get(request)) current_managable_roles = current_roles & managable_roles desired_roles = set(data['roles']) roles_added = list(desired_roles - current_managable_roles) @@ -103,7 +103,7 @@ class UpdateUserForm(forms.SelfHandlingForm): # Remove roles from user remove_status = 200 if len(roles_removed) > 0: - remove_response = stacktask.user_roles_remove( + remove_response = adjutant.user_roles_remove( request, user_id, roles_removed) @@ -115,7 +115,7 @@ class UpdateUserForm(forms.SelfHandlingForm): # Add new roles added_status = 200 if len(roles_added) > 0: - added_response = stacktask.user_roles_add( + added_response = adjutant.user_roles_add( request, user_id, roles_added) diff --git a/stacktask_ui/content/project_users/panel.py b/adjutant_ui/content/project_users/panel.py similarity index 100% rename from stacktask_ui/content/project_users/panel.py rename to adjutant_ui/content/project_users/panel.py diff --git a/stacktask_ui/content/project_users/tables.py b/adjutant_ui/content/project_users/tables.py similarity index 94% rename from stacktask_ui/content/project_users/tables.py rename to adjutant_ui/content/project_users/tables.py index 4205bf0..7046ff4 100644 --- a/stacktask_ui/content/project_users/tables.py +++ b/adjutant_ui/content/project_users/tables.py @@ -20,8 +20,8 @@ from django.utils.translation import ungettext_lazy from horizon import exceptions from horizon import tables -from stacktask_ui.api import stacktask -from stacktask_ui.content.project_users import utils +from adjutant_ui.api import adjutant +from adjutant_ui.content.project_users import utils class InviteUser(tables.LinkAction): @@ -65,7 +65,7 @@ class ResendInvitation(tables.BatchAction): def action(self, request, datum_id): user = self.table.get_object_by_id(datum_id) - stacktask.user_invitation_resend(request, user.id) + adjutant.user_invitation_resend(request, user.id) class UpdateUser(tables.LinkAction): @@ -108,11 +108,11 @@ class RevokeUser(tables.DeleteAction): result = None if user.cohort == 'Invited': # Revoke invite for the user - result = stacktask.user_revoke(request, user.id) + result = adjutant.user_revoke(request, user.id) else: # Revoke all roles from the user. # That'll get them out of our project; they keep their account. - result = stacktask.user_roles_remove( + result = adjutant.user_roles_remove( request, user.id, user.roles) if not result or result.status_code != 200: exception = exceptions.NotAvailable() @@ -124,7 +124,7 @@ class UpdateUserRow(tables.Row): ajax = True def get_data(self, request, user_id): - user = stacktask.user_get(request, user_id) + user = adjutant.user_get(request, user_id) return user def load_cells(self, user=None): diff --git a/stacktask_ui/content/project_users/templates/project_users/_invite.html b/adjutant_ui/content/project_users/templates/project_users/_invite.html similarity index 100% rename from stacktask_ui/content/project_users/templates/project_users/_invite.html rename to adjutant_ui/content/project_users/templates/project_users/_invite.html diff --git a/stacktask_ui/content/project_users/templates/project_users/_update.html b/adjutant_ui/content/project_users/templates/project_users/_update.html similarity index 100% rename from stacktask_ui/content/project_users/templates/project_users/_update.html rename to adjutant_ui/content/project_users/templates/project_users/_update.html diff --git a/stacktask_ui/content/project_users/templates/project_users/index.html b/adjutant_ui/content/project_users/templates/project_users/index.html similarity index 100% rename from stacktask_ui/content/project_users/templates/project_users/index.html rename to adjutant_ui/content/project_users/templates/project_users/index.html diff --git a/stacktask_ui/content/project_users/templates/project_users/invite.html b/adjutant_ui/content/project_users/templates/project_users/invite.html similarity index 100% rename from stacktask_ui/content/project_users/templates/project_users/invite.html rename to adjutant_ui/content/project_users/templates/project_users/invite.html diff --git a/stacktask_ui/content/project_users/templates/project_users/update.html b/adjutant_ui/content/project_users/templates/project_users/update.html similarity index 100% rename from stacktask_ui/content/project_users/templates/project_users/update.html rename to adjutant_ui/content/project_users/templates/project_users/update.html diff --git a/stacktask_ui/content/project_users/urls.py b/adjutant_ui/content/project_users/urls.py similarity index 94% rename from stacktask_ui/content/project_users/urls.py rename to adjutant_ui/content/project_users/urls.py index 6c393d5..1805797 100644 --- a/stacktask_ui/content/project_users/urls.py +++ b/adjutant_ui/content/project_users/urls.py @@ -15,7 +15,7 @@ from django.conf.urls import patterns from django.conf.urls import url -from stacktask_ui.content.project_users import views +from adjutant_ui.content.project_users import views urlpatterns = patterns( diff --git a/stacktask_ui/content/project_users/utils.py b/adjutant_ui/content/project_users/utils.py similarity index 100% rename from stacktask_ui/content/project_users/utils.py rename to adjutant_ui/content/project_users/utils.py diff --git a/stacktask_ui/content/project_users/views.py b/adjutant_ui/content/project_users/views.py similarity index 91% rename from stacktask_ui/content/project_users/views.py rename to adjutant_ui/content/project_users/views.py index b4020a4..c4505d9 100644 --- a/stacktask_ui/content/project_users/views.py +++ b/adjutant_ui/content/project_users/views.py @@ -21,11 +21,11 @@ from horizon import forms from horizon import tables from horizon.utils import memoized -from stacktask_ui.content.project_users import tables as users_tables +from adjutant_ui.content.project_users import tables as users_tables -from stacktask_ui.content.project_users import forms as users_forms +from adjutant_ui.content.project_users import forms as users_forms -from stacktask_ui.api import stacktask +from adjutant_ui.api import adjutant class InviteUserView(forms.ModalFormView): @@ -54,7 +54,7 @@ class UpdateUserView(forms.ModalFormView): @memoized.memoized_method def get_object(self): try: - return stacktask.user_get(self.request, + return adjutant.user_get(self.request, self.kwargs['user_id']) except Exception: msg = _('Unable to retrieve user.') @@ -84,7 +84,7 @@ class UsersView(tables.DataTableView): def get_data(self): try: - return stacktask.user_list(self.request) + return adjutant.user_list(self.request) except Exception: exceptions.handle(self.request, _('Failed to list users.')) return [] diff --git a/stacktask_ui/content/tasks/__init__.py b/adjutant_ui/content/tasks/__init__.py similarity index 100% rename from stacktask_ui/content/tasks/__init__.py rename to adjutant_ui/content/tasks/__init__.py diff --git a/stacktask_ui/content/tasks/forms.py b/adjutant_ui/content/tasks/forms.py similarity index 95% rename from stacktask_ui/content/tasks/forms.py rename to adjutant_ui/content/tasks/forms.py index 4b1abbd..de9a981 100644 --- a/stacktask_ui/content/tasks/forms.py +++ b/adjutant_ui/content/tasks/forms.py @@ -19,7 +19,7 @@ from horizon import messages import json -from stacktask_ui.api import stacktask +from adjutant_ui.api import adjutant class UpdateTaskForm(forms.SelfHandlingForm): @@ -41,7 +41,7 @@ class UpdateTaskForm(forms.SelfHandlingForm): def handle(self, request, data): task_id = self.cleaned_data.pop('task_id') try: - response = stacktask.task_update( + response = adjutant.task_update( request, task_id, data['task_data']) if response.status_code == 200: messages.success(request, _('Updated task successfully.')) diff --git a/stacktask_ui/content/tasks/panel.py b/adjutant_ui/content/tasks/panel.py similarity index 100% rename from stacktask_ui/content/tasks/panel.py rename to adjutant_ui/content/tasks/panel.py diff --git a/stacktask_ui/content/tasks/tables.py b/adjutant_ui/content/tasks/tables.py similarity index 97% rename from stacktask_ui/content/tasks/tables.py rename to adjutant_ui/content/tasks/tables.py index 1263bbf..4018a2b 100644 --- a/stacktask_ui/content/tasks/tables.py +++ b/adjutant_ui/content/tasks/tables.py @@ -18,7 +18,7 @@ from django.utils.translation import ungettext_lazy from horizon import exceptions from horizon import tables -from stacktask_ui.api import stacktask +from adjutant_ui.api import adjutant class CancelTask(tables.DeleteAction): @@ -41,7 +41,7 @@ class CancelTask(tables.DeleteAction): ) def delete(self, request, obj_id): - result = stacktask.task_cancel(request, obj_id) + result = adjutant.task_cancel(request, obj_id) if not result or result.status_code != 200: exception = exceptions.NotAvailable() exception._safe_message = False @@ -75,7 +75,7 @@ class ApproveTask(tables.BatchAction): ) def action(self, request, obj_id): - result = stacktask.task_approve(request, obj_id) + result = adjutant.task_approve(request, obj_id) if not result or result.status_code != 200: exception = exceptions.NotAvailable() exception._safe_message = False diff --git a/stacktask_ui/content/tasks/tabs.py b/adjutant_ui/content/tasks/tabs.py similarity index 96% rename from stacktask_ui/content/tasks/tabs.py rename to adjutant_ui/content/tasks/tabs.py index 332a997..e32c88a 100644 --- a/stacktask_ui/content/tasks/tabs.py +++ b/adjutant_ui/content/tasks/tabs.py @@ -17,8 +17,8 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from stacktask_ui.content.tasks import tables as task_tables -from stacktask_ui.api import stacktask +from adjutant_ui.content.tasks import tables as task_tables +from adjutant_ui.api import adjutant class ActiveTaskListTab(tabs.TableTab): @@ -37,7 +37,7 @@ class ActiveTaskListTab(tabs.TableTab): marker = self.request.GET.get( self.table_classes[0]._meta.pagination_param, 1) try: - tasks, self._prev, self._more = stacktask.task_list( + tasks, self._prev, self._more = adjutant.task_list( self.request, filters=self.filters, page=marker) except Exception: exceptions.handle(self.request, _('Failed to list tasks.')) diff --git a/stacktask_ui/content/tasks/templates/tasks/_task_detail_actions.html b/adjutant_ui/content/tasks/templates/tasks/_task_detail_actions.html similarity index 100% rename from stacktask_ui/content/tasks/templates/tasks/_task_detail_actions.html rename to adjutant_ui/content/tasks/templates/tasks/_task_detail_actions.html diff --git a/stacktask_ui/content/tasks/templates/tasks/_task_detail_notes.html b/adjutant_ui/content/tasks/templates/tasks/_task_detail_notes.html similarity index 100% rename from stacktask_ui/content/tasks/templates/tasks/_task_detail_notes.html rename to adjutant_ui/content/tasks/templates/tasks/_task_detail_notes.html diff --git a/stacktask_ui/content/tasks/templates/tasks/_task_detail_overview.html b/adjutant_ui/content/tasks/templates/tasks/_task_detail_overview.html similarity index 100% rename from stacktask_ui/content/tasks/templates/tasks/_task_detail_overview.html rename to adjutant_ui/content/tasks/templates/tasks/_task_detail_overview.html diff --git a/stacktask_ui/content/tasks/templates/tasks/_update.html b/adjutant_ui/content/tasks/templates/tasks/_update.html similarity index 100% rename from stacktask_ui/content/tasks/templates/tasks/_update.html rename to adjutant_ui/content/tasks/templates/tasks/_update.html diff --git a/stacktask_ui/content/tasks/templates/tasks/index.html b/adjutant_ui/content/tasks/templates/tasks/index.html similarity index 100% rename from stacktask_ui/content/tasks/templates/tasks/index.html rename to adjutant_ui/content/tasks/templates/tasks/index.html diff --git a/stacktask_ui/content/tasks/templates/tasks/update.html b/adjutant_ui/content/tasks/templates/tasks/update.html similarity index 100% rename from stacktask_ui/content/tasks/templates/tasks/update.html rename to adjutant_ui/content/tasks/templates/tasks/update.html diff --git a/stacktask_ui/content/tasks/templatetags/__init__.py b/adjutant_ui/content/tasks/templatetags/__init__.py similarity index 100% rename from stacktask_ui/content/tasks/templatetags/__init__.py rename to adjutant_ui/content/tasks/templatetags/__init__.py diff --git a/stacktask_ui/content/tasks/templatetags/task_filters.py b/adjutant_ui/content/tasks/templatetags/task_filters.py similarity index 100% rename from stacktask_ui/content/tasks/templatetags/task_filters.py rename to adjutant_ui/content/tasks/templatetags/task_filters.py diff --git a/stacktask_ui/content/tasks/urls.py b/adjutant_ui/content/tasks/urls.py similarity index 95% rename from stacktask_ui/content/tasks/urls.py rename to adjutant_ui/content/tasks/urls.py index 4e3b488..005133e 100644 --- a/stacktask_ui/content/tasks/urls.py +++ b/adjutant_ui/content/tasks/urls.py @@ -15,7 +15,7 @@ from django.conf.urls import patterns from django.conf.urls import url -from stacktask_ui.content.tasks import views +from adjutant_ui.content.tasks import views urlpatterns = patterns( diff --git a/stacktask_ui/content/tasks/views.py b/adjutant_ui/content/tasks/views.py similarity index 87% rename from stacktask_ui/content/tasks/views.py rename to adjutant_ui/content/tasks/views.py index aa6d49f..c56ef89 100644 --- a/stacktask_ui/content/tasks/views.py +++ b/adjutant_ui/content/tasks/views.py @@ -21,10 +21,10 @@ from horizon import tabs from horizon.utils import memoized -from stacktask_ui.content.tasks import tables as task_tables -from stacktask_ui.content.tasks import forms as task_forms -from stacktask_ui.content.tasks import tabs as task_tabs -from stacktask_ui.api import stacktask +from adjutant_ui.content.tasks import tables as task_tables +from adjutant_ui.content.tasks import forms as task_forms +from adjutant_ui.content.tasks import tabs as task_tabs +from adjutant_ui.api import adjutant import json @@ -48,7 +48,7 @@ class TaskDetailView(tabs.TabView): context["task"] = task context["url"] = reverse(self.redirect_url) context["actions"] = self._get_actions( - stacktask.task_obj_get(self.request, task=task)) + adjutant.task_obj_get(self.request, task=task)) return context def _get_actions(self, task): @@ -57,7 +57,7 @@ class TaskDetailView(tabs.TabView): @memoized.memoized_method def get_data(self): - return stacktask.task_get(self.request, self.kwargs['task_id']).json() + return adjutant.task_get(self.request, self.kwargs['task_id']).json() def get_tabs(self, request, *args, **kwargs): task = self.get_data() @@ -82,8 +82,8 @@ class UpdateTaskView(forms.ModalFormView): @memoized.memoized_method def get_object(self): try: - return stacktask.task_get(self.request, - self.kwargs['task_id']).json() + return adjutant.task_get(self.request, + self.kwargs['task_id']).json() except Exception: msg = _('Unable to retrieve user.') url = reverse('horizon:management:tasks:index') diff --git a/stacktask_ui/content/token/__init__.py b/adjutant_ui/content/token/__init__.py similarity index 100% rename from stacktask_ui/content/token/__init__.py rename to adjutant_ui/content/token/__init__.py diff --git a/stacktask_ui/content/token/forms.py b/adjutant_ui/content/token/forms.py similarity index 100% rename from stacktask_ui/content/token/forms.py rename to adjutant_ui/content/token/forms.py diff --git a/stacktask_ui/content/token/panel.py b/adjutant_ui/content/token/panel.py similarity index 94% rename from stacktask_ui/content/token/panel.py rename to adjutant_ui/content/token/panel.py index 74a1378..2348c18 100644 --- a/stacktask_ui/content/token/panel.py +++ b/adjutant_ui/content/token/panel.py @@ -20,5 +20,5 @@ import horizon class TokenPanel(horizon.Panel): name = _('Token') slug = 'token' - urls = 'stacktask_ui.content.token.urls' + urls = 'adjutant_ui.content.token.urls' nav = False diff --git a/stacktask_ui/content/token/templates/token/_setpassword.html b/adjutant_ui/content/token/templates/token/_setpassword.html similarity index 100% rename from stacktask_ui/content/token/templates/token/_setpassword.html rename to adjutant_ui/content/token/templates/token/_setpassword.html diff --git a/stacktask_ui/content/token/templates/token/_setpassword_form.html b/adjutant_ui/content/token/templates/token/_setpassword_form.html similarity index 100% rename from stacktask_ui/content/token/templates/token/_setpassword_form.html rename to adjutant_ui/content/token/templates/token/_setpassword_form.html diff --git a/stacktask_ui/content/token/templates/token/_tokenconfirm.html b/adjutant_ui/content/token/templates/token/_tokenconfirm.html similarity index 100% rename from stacktask_ui/content/token/templates/token/_tokenconfirm.html rename to adjutant_ui/content/token/templates/token/_tokenconfirm.html diff --git a/stacktask_ui/content/token/templates/token/_tokenconfirm_form.html b/adjutant_ui/content/token/templates/token/_tokenconfirm_form.html similarity index 100% rename from stacktask_ui/content/token/templates/token/_tokenconfirm_form.html rename to adjutant_ui/content/token/templates/token/_tokenconfirm_form.html diff --git a/stacktask_ui/content/token/templates/token/setpassword.html b/adjutant_ui/content/token/templates/token/setpassword.html similarity index 100% rename from stacktask_ui/content/token/templates/token/setpassword.html rename to adjutant_ui/content/token/templates/token/setpassword.html diff --git a/stacktask_ui/content/token/templates/token/tokenconfirm.html b/adjutant_ui/content/token/templates/token/tokenconfirm.html similarity index 100% rename from stacktask_ui/content/token/templates/token/tokenconfirm.html rename to adjutant_ui/content/token/templates/token/tokenconfirm.html diff --git a/stacktask_ui/content/token/urls.py b/adjutant_ui/content/token/urls.py similarity index 94% rename from stacktask_ui/content/token/urls.py rename to adjutant_ui/content/token/urls.py index 6b857ff..7c50def 100644 --- a/stacktask_ui/content/token/urls.py +++ b/adjutant_ui/content/token/urls.py @@ -16,7 +16,7 @@ from django.conf.urls import patterns from django.conf.urls import url -from stacktask_ui.content.token import views +from adjutant_ui.content.token import views urlpatterns = patterns( '', diff --git a/stacktask_ui/content/token/views.py b/adjutant_ui/content/token/views.py similarity index 89% rename from stacktask_ui/content/token/views.py rename to adjutant_ui/content/token/views.py index ba9763c..200f34f 100644 --- a/stacktask_ui/content/token/views.py +++ b/adjutant_ui/content/token/views.py @@ -21,8 +21,8 @@ from horizon import exceptions from horizon import forms from horizon.utils import functions as utils -from stacktask_ui.api import stacktask -from stacktask_ui.content.token import forms as token_forms +from adjutant_ui.api import adjutant +from adjutant_ui.content.token import forms as token_forms def _logout_msg_response(request, msg): @@ -42,7 +42,7 @@ def submit_token_router(request, *args, **kwargs): # Get details of the token token_uuid = kwargs['token'] - token = stacktask.token_get(request, token_uuid, {}) + token = adjutant.token_get(request, token_uuid, {}) if not token or token.status_code != 200: msg = _("Invalid token. Please request another.") return _logout_msg_response(request, msg) @@ -76,9 +76,9 @@ class SubmitTokenPasswordView(forms.ModalFormView): 'password': form.cleaned_data['new_password'] } token_uuid = self.kwargs['token'] - token_response = stacktask.token_submit(form.request, - token_uuid, - parameters) + token_response = adjutant.token_submit(form.request, + token_uuid, + parameters) if token_response.ok: msg = _("Password successfully set. Please log in to continue.") @@ -115,9 +115,9 @@ class SubmitTokenConfirmView(forms.ModalFormView): parameters = { 'confirm': True } - token_response = stacktask.token_submit(form.request, - token_uuid, - parameters) + token_response = adjutant.token_submit(form.request, + token_uuid, + parameters) if token_response.ok: msg = _("Welcome to the project! Please log in to continue.") diff --git a/stacktask_ui/dashboards/__init__.py b/adjutant_ui/dashboards/__init__.py similarity index 100% rename from stacktask_ui/dashboards/__init__.py rename to adjutant_ui/dashboards/__init__.py diff --git a/stacktask_ui/dashboards/forgot_password_dash.py b/adjutant_ui/dashboards/forgot_password_dash.py similarity index 94% rename from stacktask_ui/dashboards/forgot_password_dash.py rename to adjutant_ui/dashboards/forgot_password_dash.py index 764317d..0ec980b 100644 --- a/stacktask_ui/dashboards/forgot_password_dash.py +++ b/adjutant_ui/dashboards/forgot_password_dash.py @@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _ import horizon -from stacktask_ui.content.forgot_password import panel +from adjutant_ui.content.forgot_password import panel class ForgotPasswordDashboard(horizon.Dashboard): diff --git a/stacktask_ui/dashboards/management.py b/adjutant_ui/dashboards/management.py similarity index 94% rename from stacktask_ui/dashboards/management.py rename to adjutant_ui/dashboards/management.py index 1927be5..f4ce600 100644 --- a/stacktask_ui/dashboards/management.py +++ b/adjutant_ui/dashboards/management.py @@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _ import horizon -from stacktask_ui.content.default import panel +from adjutant_ui.content.default import panel class ManagementDashboard(horizon.Dashboard): diff --git a/stacktask_ui/dashboards/token_dash.py b/adjutant_ui/dashboards/token_dash.py similarity index 95% rename from stacktask_ui/dashboards/token_dash.py rename to adjutant_ui/dashboards/token_dash.py index 9301455..fe44499 100644 --- a/stacktask_ui/dashboards/token_dash.py +++ b/adjutant_ui/dashboards/token_dash.py @@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _ import horizon -from stacktask_ui.content.token import panel +from adjutant_ui.content.token import panel class TokenDashboard(horizon.Dashboard): diff --git a/stacktask_ui/enabled/_6000_management.py b/adjutant_ui/enabled/_6000_management.py similarity index 81% rename from stacktask_ui/enabled/_6000_management.py rename to adjutant_ui/enabled/_6000_management.py index 7a5f659..62f704d 100644 --- a/stacktask_ui/enabled/_6000_management.py +++ b/adjutant_ui/enabled/_6000_management.py @@ -3,5 +3,5 @@ DASHBOARD = 'management' # A list of applications to be added to INSTALLED_APPS. ADD_INSTALLED_APPS = [ - 'stacktask_ui.dashboards.management' + 'adjutant_ui.dashboards.management' ] diff --git a/stacktask_ui/enabled/_6001_stacktask_base.py b/adjutant_ui/enabled/_6001_adjutant_base.py similarity index 60% rename from stacktask_ui/enabled/_6001_stacktask_base.py rename to adjutant_ui/enabled/_6001_adjutant_base.py index e9de6f9..be6a523 100644 --- a/stacktask_ui/enabled/_6001_stacktask_base.py +++ b/adjutant_ui/enabled/_6001_adjutant_base.py @@ -1,8 +1,8 @@ # Making use of this to make a generic enabled file -# to load base stacktask-ui content. -FEATURE = "stacktask-ui-base" +# to load base adjutant-ui content. +FEATURE = "adjutant-ui-base" # A list of applications to be added to INSTALLED_APPS. ADD_INSTALLED_APPS = [ - 'stacktask_ui' + 'adjutant_ui' ] diff --git a/stacktask_ui/enabled/_6010_token.py b/adjutant_ui/enabled/_6010_token.py similarity index 70% rename from stacktask_ui/enabled/_6010_token.py rename to adjutant_ui/enabled/_6010_token.py index 3fe83e9..ef89877 100644 --- a/stacktask_ui/enabled/_6010_token.py +++ b/adjutant_ui/enabled/_6010_token.py @@ -3,6 +3,6 @@ DASHBOARD = 'token' # A list of applications to be added to INSTALLED_APPS. ADD_INSTALLED_APPS = [ - 'stacktask_ui.dashboards.token_dash', - 'stacktask_ui.content.token', + 'adjutant_ui.dashboards.token_dash', + 'adjutant_ui.content.token', ] diff --git a/stacktask_ui/enabled/_6015_forgot_password.py b/adjutant_ui/enabled/_6015_forgot_password.py similarity index 68% rename from stacktask_ui/enabled/_6015_forgot_password.py rename to adjutant_ui/enabled/_6015_forgot_password.py index 1cf44af..2712b8e 100644 --- a/stacktask_ui/enabled/_6015_forgot_password.py +++ b/adjutant_ui/enabled/_6015_forgot_password.py @@ -3,7 +3,7 @@ DASHBOARD = 'forgot_password' # A list of applications to be added to INSTALLED_APPS. ADD_INSTALLED_APPS = [ - 'stacktask_ui.dashboards.forgot_password_dash', - 'stacktask_ui.content.forgot_password', + 'adjutant_ui.dashboards.forgot_password_dash', + 'adjutant_ui.content.forgot_password', 'overextends', ] diff --git a/stacktask_ui/enabled/_6020_management_access_control_group.py b/adjutant_ui/enabled/_6020_management_access_control_group.py similarity index 100% rename from stacktask_ui/enabled/_6020_management_access_control_group.py rename to adjutant_ui/enabled/_6020_management_access_control_group.py diff --git a/stacktask_ui/enabled/_6021_management_project_users.py b/adjutant_ui/enabled/_6021_management_project_users.py similarity index 82% rename from stacktask_ui/enabled/_6021_management_project_users.py rename to adjutant_ui/enabled/_6021_management_project_users.py index 31a0954..ca17258 100644 --- a/stacktask_ui/enabled/_6021_management_project_users.py +++ b/adjutant_ui/enabled/_6021_management_project_users.py @@ -6,4 +6,4 @@ PANEL_DASHBOARD = 'management' PANEL_GROUP = 'access_control' # Python panel class of the PANEL to be added. -ADD_PANEL = 'stacktask_ui.content.project_users.panel.ProjectUsers' +ADD_PANEL = 'adjutant_ui.content.project_users.panel.ProjectUsers' diff --git a/stacktask_ui/enabled/_6090_management_task_list.py b/adjutant_ui/enabled/_6090_management_task_list.py similarity index 79% rename from stacktask_ui/enabled/_6090_management_task_list.py rename to adjutant_ui/enabled/_6090_management_task_list.py index dd01064..d5ee028 100644 --- a/stacktask_ui/enabled/_6090_management_task_list.py +++ b/adjutant_ui/enabled/_6090_management_task_list.py @@ -6,8 +6,8 @@ PANEL_DASHBOARD = 'management' PANEL_GROUP = 'default' # Python panel class of the PANEL to be added. -ADD_PANEL = 'stacktask_ui.content.tasks.panel.TaskList' +ADD_PANEL = 'adjutant_ui.content.tasks.panel.TaskList' ADD_INSTALLED_APPS = [ - 'stacktask_ui.content.tasks' + 'adjutant_ui.content.tasks' ] diff --git a/stacktask_ui/enabled/__init__.py b/adjutant_ui/enabled/__init__.py similarity index 100% rename from stacktask_ui/enabled/__init__.py rename to adjutant_ui/enabled/__init__.py diff --git a/stacktask_ui/karma.conf.js b/adjutant_ui/karma.conf.js similarity index 100% rename from stacktask_ui/karma.conf.js rename to adjutant_ui/karma.conf.js diff --git a/stacktask_ui/templates/auth/_login_page.html b/adjutant_ui/templates/auth/_login_page.html similarity index 100% rename from stacktask_ui/templates/auth/_login_page.html rename to adjutant_ui/templates/auth/_login_page.html diff --git a/stacktask_ui/templatetags/__init__.py b/adjutant_ui/templatetags/__init__.py similarity index 100% rename from stacktask_ui/templatetags/__init__.py rename to adjutant_ui/templatetags/__init__.py diff --git a/stacktask_ui/templatetags/relabel_username_field.py b/adjutant_ui/templatetags/relabel_username_field.py similarity index 100% rename from stacktask_ui/templatetags/relabel_username_field.py rename to adjutant_ui/templatetags/relabel_username_field.py diff --git a/stacktask_ui/test/__init__.py b/adjutant_ui/test/__init__.py similarity index 100% rename from stacktask_ui/test/__init__.py rename to adjutant_ui/test/__init__.py diff --git a/stacktask_ui/test/api_tests/__init__.py b/adjutant_ui/test/api_tests/__init__.py similarity index 100% rename from stacktask_ui/test/api_tests/__init__.py rename to adjutant_ui/test/api_tests/__init__.py diff --git a/stacktask_ui/test/api_tests/rest_api_tests.py b/adjutant_ui/test/api_tests/rest_api_tests.py similarity index 95% rename from stacktask_ui/test/api_tests/rest_api_tests.py rename to adjutant_ui/test/api_tests/rest_api_tests.py index 1476ded..1ea2bf3 100644 --- a/stacktask_ui/test/api_tests/rest_api_tests.py +++ b/adjutant_ui/test/api_tests/rest_api_tests.py @@ -14,7 +14,7 @@ import mock from openstack_dashboard.test.test_data import utils -from stacktask_ui.test import test_data +from adjutant_ui.test import test_data TEST = utils.TestData(test_data.data) diff --git a/stacktask_ui/test/helpers.py b/adjutant_ui/test/helpers.py similarity index 91% rename from stacktask_ui/test/helpers.py rename to adjutant_ui/test/helpers.py index 11d203a..e76fdb4 100644 --- a/stacktask_ui/test/helpers.py +++ b/adjutant_ui/test/helpers.py @@ -14,7 +14,7 @@ from openstack_dashboard.test import helpers class APITestCase(helpers.APITestCase): - """Extends the base Horizon APITestCase for stacktaskclient""" + """Extends the base Horizon APITestCase for adjutantclient""" def setUp(self): super(APITestCase, self).setUp() diff --git a/stacktask_ui/test/integration_tests/__init__.py b/adjutant_ui/test/integration_tests/__init__.py similarity index 100% rename from stacktask_ui/test/integration_tests/__init__.py rename to adjutant_ui/test/integration_tests/__init__.py diff --git a/stacktask_ui/test/settings.py b/adjutant_ui/test/settings.py similarity index 92% rename from stacktask_ui/test/settings.py rename to adjutant_ui/test/settings.py index fa3555f..e0cde39 100644 --- a/stacktask_ui/test/settings.py +++ b/adjutant_ui/test/settings.py @@ -14,11 +14,11 @@ from horizon.test.settings import * # noqa from openstack_dashboard.test.settings import * # noqa -# Update the dashboards with stacktask_ui +# Update the dashboards with adjutant_ui import openstack_dashboard.enabled from openstack_dashboard.utils import settings -import stacktask_ui.enabled +import adjutant_ui.enabled # pop these keys to avoid log warnings about deprecation # update_dashboards will populate them anyway @@ -27,7 +27,7 @@ HORIZON_CONFIG.pop('default_dashboard', None) settings.update_dashboards( [ - stacktask_ui.enabled, + adjutant_ui.enabled, openstack_dashboard.enabled, ], HORIZON_CONFIG, diff --git a/stacktask_ui/test/test_data.py b/adjutant_ui/test/test_data.py similarity index 100% rename from stacktask_ui/test/test_data.py rename to adjutant_ui/test/test_data.py diff --git a/stacktask_ui/version.py b/adjutant_ui/version.py similarity index 91% rename from stacktask_ui/version.py rename to adjutant_ui/version.py index a836e82..b039915 100644 --- a/stacktask_ui/version.py +++ b/adjutant_ui/version.py @@ -12,4 +12,4 @@ import pbr.version -version_info = pbr.version.VersionInfo('stacktask-ui') +version_info = pbr.version.VersionInfo('adjutant-ui') diff --git a/doc/source/conf.py b/doc/source/conf.py index 18dd72c..c873e6d 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -37,8 +37,8 @@ sys.path.insert(0, ROOT) os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'openstack_dashboard.test.settings') -from stacktask_ui \ - import version as stacktask_ui_ver +from adjutant_ui \ + import version as adjutant_ui_ver def write_autodoc_index(): @@ -67,7 +67,7 @@ def write_autodoc_index(): return modlist RSTDIR = os.path.abspath(os.path.join(BASE_DIR, "sourcecode")) - SRCS = [('stacktask_ui_ver', ROOT), ] + SRCS = [('adjutant_ui_ver', ROOT), ] EXCLUDED_MODULES = () CURRENT_SOURCES = {} @@ -183,7 +183,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'StackTask UI' +project = u'Adjutant UI' copyright = u'2017, Catalyst IT Ltd' # The version info for the project you're documenting, acts as replacement for @@ -191,9 +191,9 @@ copyright = u'2017, Catalyst IT Ltd' # built documents. # # The short X.Y version. -version = stacktask_ui_ver.version_info.version_string() +version = adjutant_ui_ver.version_info.version_string() # The full version, including alpha/beta/rc tags. -release = stacktask_ui_ver.version_info.release_string() +release = adjutant_ui_ver.version_info.release_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -368,8 +368,8 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', u'StackTask UI Documentation', - 'Documentation for the StackTask UI plugin to the OpenStack\ + ('index', u'Adjutant UI Documentation', + 'Documentation for the Adjutant UI plugin to the OpenStack\ Dashboard (Horizon)', [u'OpenStack'], 1) ] diff --git a/doc/source/index.rst b/doc/source/index.rst index b98ce02..50b444e 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,19 +1,19 @@ ============ -stacktask-ui +adjutant-ui ============ -StackTask Dashboard +Adjutant Dashboard * Free software: Apache license -* Source: https://github.com/catalyst/stacktask-ui +* Source: https://github.com/catalyst/adjutant-ui Installation instructions ========================= -Begin by cloning the Horizon and StackTask UI repositories:: +Begin by cloning the Horizon and Adjutant UI repositories:: git clone https://github.com/openstack/horizon - git clone https://github.com/catalyst/stacktask-ui + git clone https://github.com/catalyst/adjutant-ui Create a virtual environment and install Horizon dependencies:: @@ -33,7 +33,7 @@ editor. You will want to customize several settings: environment. (They should be correct unless you modified your OpenStack server to change them.) - ``OPENSTACK_REGISTRATION_URL`` should also be configured to point to - you StackTask server and version. + you Adjutant server and version. You will also need to update the ``keystone_policy.json`` file in horizon with the following lines:: @@ -44,13 +44,13 @@ the following lines:: "project_admin_only": "rule:admin_required or rule:project_admin", "identity:project_users_access": "rule:project_mod_or_admin", -Install StackTask UI with all dependencies in your virtual environment:: +Install Adjutant UI with all dependencies in your virtual environment:: - tools/with_venv.sh pip install -e ../stacktask-ui/ + tools/with_venv.sh pip install -e ../adjutant-ui/ And enable it in Horizon:: - cp ../stacktask-ui/enabled/ openstack_dashboard/local/enabled + cp ../adjutant-ui/enabled/ openstack_dashboard/local/enabled Release Notes ============= diff --git a/doc/source/releases/0.1.0.rst b/doc/source/releases/0.1.0.rst index 2d9a147..682d6c2 100644 --- a/doc/source/releases/0.1.0.rst +++ b/doc/source/releases/0.1.0.rst @@ -1,2 +1,2 @@ -StackTask UI 0.1.1 +Adjutant UI 0.1.1 =============== diff --git a/run_tests.sh b/run_tests.sh index 976b686..9fa0cd9 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -57,7 +57,7 @@ root=`pwd -P` venv=$root/.venv venv_env_version=$venv/environments with_venv=tools/with_venv.sh -included_dirs="stacktask_ui" +included_dirs="adjutant_ui" always_venv=0 backup_env=0 @@ -340,7 +340,7 @@ function run_tests { fi if [ $with_selenium -eq 0 -a $integration -eq 0 ]; then - testopts="$testopts --exclude-dir=stacktask_ui/test/integration_tests" + testopts="$testopts --exclude-dir=adjutant_ui/test/integration_tests" fi if [ $selenium_headless -eq 1 ]; then @@ -360,12 +360,12 @@ function run_tests_subset { } function run_tests_all { - echo "Running StackTask UI tests" - export NOSE_XUNIT_FILE=stacktask_ui/nosetests.xml + echo "Running Adjutant UI tests" + export NOSE_XUNIT_FILE=adjutant_ui/nosetests.xml if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then export NOSE_HTML_OUT_FILE='dashboard_nose_results.html' fi - ${command_wrapper} ${coverage_run} $root/manage.py test stacktask_ui --settings=openstack_dashboard.test.settings $testopts + ${command_wrapper} ${coverage_run} $root/manage.py test adjutant_ui --settings=openstack_dashboard.test.settings $testopts # get results of the openstack_dashboard tests DASHBOARD_RESULT=$? @@ -420,21 +420,21 @@ function babel_extract { } function run_makemessages { - echo -n "stacktask ui: " + echo -n "adjutant ui: " cd babel_extract django - STACKTASK_PY_RESULT=$? + ADJUTANT_PY_RESULT=$? - echo -n "stacktask ui javascript: " + echo -n "adjutant ui javascript: " babel_extract djangojs - STACKTASK_JS_RESULT=$? + ADJUTANT_JS_RESULT=$? cd ../ if [ $check_only -eq 1 ]; then - rm -f stacktask_ui/locale/django*.pot + rm -f adjutant_ui/locale/django*.pot fi - exit $(($STACKTASK_PY_RESULT || $STACKTASK_JS_RESULT)) + exit $(($ADJUTANT_PY_RESULT || $ADJUTANT_JS_RESULT)) } function run_compilemessages { diff --git a/setup.cfg b/setup.cfg index cc2c03c..fb6915a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [metadata] -name = stacktask-ui -summary = StackTask User Interface +name = adjutant-ui +summary = Adjutant User Interface description-file = README.rst author = Adrian Turjak author-email = adriant@catalyst.net.nz -home-page = https://github.com/catalyst/stacktask-ui +home-page = https://github.com/catalyst/adjutant-ui classifier = Environment :: OpenStack Framework :: Django @@ -21,7 +21,7 @@ classifier = [files] packages = - stacktask_ui + adjutant_ui [build_sphinx] all_files = 1 diff --git a/tox.ini b/tox.ini index 164ca42..6166d25 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_RED=0.05 NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_SHOW_ELAPSED=1 - DJANGO_SETTINGS_MODULE=stacktask_ui.test.settings + DJANGO_SETTINGS_MODULE=adjutant_ui.test.settings install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -26,7 +26,7 @@ commands = {posargs} [testenv:cover] commands = coverage erase - coverage run {toxinidir}/manage.py test stacktask_ui + coverage run {toxinidir}/manage.py test adjutant_ui coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml' coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'