From aa09bf31cbebb2a95bf783c6fd7c18d500f45bab Mon Sep 17 00:00:00 2001 From: jeznorth Date: Thu, 9 Jan 2020 14:49:03 -0800 Subject: [PATCH] Entity2298 HOTFIX (#334) * [entity2298] Update Language in Role Change Confirmation Email * [entity2298] Whitespace Fix * [entity2298] Fixing Issues With Email Template * [entity2298] Fixing Issue with Button Spacing in Confirmation Modal * [entity2298] Fixing strings for email notification message * [bug] Fixed issue with user profile form button alignment --- .../role_changed_notification_email.html | 114 +++++++++--------- .../93ba1db65ed3_update_membership_type.py | 6 +- .../src/components/auth/UserProfileForm.vue | 6 +- .../src/views/management/UserManagement.vue | 6 +- 4 files changed, 67 insertions(+), 65 deletions(-) diff --git a/auth-api/email_templates/role_changed_notification_email.html b/auth-api/email_templates/role_changed_notification_email.html index 380ef6a215..debde7a6d6 100644 --- a/auth-api/email_templates/role_changed_notification_email.html +++ b/auth-api/email_templates/role_changed_notification_email.html @@ -1,69 +1,69 @@ - - - Your Role Has Been Changed - - - chat.pathfinder.gov.bc.ca - - - - - + img { + border: none; + } + + + chat.pathfinder.gov.bc.ca + + + + + - - - + + +
- - - - - - - -
- Government of British Columbia -
-

- Your role in the {{ params['org_name'] }} team at Cooperatives Online has been changed and you are now {{params['role']}}. -

-

- As {{params['role']}} , now you {{params['label']}} -

-

- As a To access this team, log into Cooperatives Online using your BC Services Card. -

- -
-
+ + + + + + + +
+ Government of British Columbia +
+

+ Your role on the {{params['org_name']}} team at Cooperatives Online has been changed. +

+

+ Your new role: {{params['role']}}
+ As a {{params['role']}}, you {{params['label']}} +

+

+ To access this team, log into Cooperatives Online using your BC Services Card. +

+ +
+
\ No newline at end of file diff --git a/auth-api/migrations/versions/93ba1db65ed3_update_membership_type.py b/auth-api/migrations/versions/93ba1db65ed3_update_membership_type.py index 3afe184b8f..c066adcc6a 100644 --- a/auth-api/migrations/versions/93ba1db65ed3_update_membership_type.py +++ b/auth-api/migrations/versions/93ba1db65ed3_update_membership_type.py @@ -23,9 +23,9 @@ def upgrade(): # ### end Alembic commands ### # Update all existing user records to active - op.execute('update "membership_type" set icon=\'mdi-account\', label=\'Can add businesses, and file for a business.\' where code=\'MEMBER\'') - op.execute('update "membership_type" set icon=\'mdi-settings\', label=\'Can add/remove team members, add businesses, and file for a business.\' where code=\'ADMIN\'') - op.execute('update "membership_type" set icon=\'mdi-shield-key\', label=\'Can add/remove team members and businesses, and file for a business.\' where code=\'OWNER\'') + op.execute('update "membership_type" set icon=\'mdi-account\', label=\'can add businesses, and file for a business.\' where code=\'MEMBER\'') + op.execute('update "membership_type" set icon=\'mdi-settings\', label=\'can add/remove team members, add businesses, and file for a business.\' where code=\'ADMIN\'') + op.execute('update "membership_type" set icon=\'mdi-shield-key\', label=\'can add/remove team members and businesses, and file for a business.\' where code=\'OWNER\'') def downgrade(): diff --git a/auth-web/src/components/auth/UserProfileForm.vue b/auth-web/src/components/auth/UserProfileForm.vue index 11ab333ef1..f6b17c7b8e 100644 --- a/auth-web/src/components/auth/UserProfileForm.vue +++ b/auth-web/src/components/auth/UserProfileForm.vue @@ -318,10 +318,14 @@ export default class UserProfileForm extends Mixins(NextPageMixin) { .form__btns { display: flex; - justify-content: space-between; + justify-content: flex-end; .v-btn + .v-btn { margin-left: 0.5rem; } + + .deactivate-btn { + margin-right: auto; + } } diff --git a/auth-web/src/views/management/UserManagement.vue b/auth-web/src/views/management/UserManagement.vue index b00a065621..6a0ab1464e 100644 --- a/auth-web/src/views/management/UserManagement.vue +++ b/auth-web/src/views/management/UserManagement.vue @@ -96,10 +96,8 @@ {{ confirmActionText }}