You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/12/10 21:43:15 UTC

[airavata-django-portal] 22/24: AIRAVATA-3319 Fix warning message in change username confirmation

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 3b21298219a73ea60858df67642d06084b356513
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Dec 10 15:20:09 2021 -0500

    AIRAVATA-3319 Fix warning message in change username confirmation
---
 .../src/components/users/ChangeUsernamePanel.vue      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ChangeUsernamePanel.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ChangeUsernamePanel.vue
index 930270c..35ef215 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ChangeUsernamePanel.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ChangeUsernamePanel.vue
@@ -35,18 +35,21 @@
     <confirmation-button
       variant="primary"
       @confirmed="updateUsername"
-      :disabled="$v.$invalid"
+      :disabled="$v.$invalid || username === newUsername"
       dialog-title="Please confirm username change"
     >
       Please confirm that you want to change the user's username to
       <strong>{{ newUsername }}</strong
-      >. NOTE: if this user already has an Airavata User Profile, giving the
-      user a new username will result in
-      <strong
-        >the user getting a new Airavata User Profile and losing the old
-        one</strong
-      >. Also, after updating the username the user will need to log out and log
-      back in.
+      >. After updating the username the user will need to log out and log back
+      in.
+      <b-alert variant="danger" :show="airavataUserProfileExists">
+        This user already has an Airavata User Profile. Giving the user a new
+        username will result in the user getting a new Airavata User Profile and
+        <strong
+          >losing the old one and everything (projects, experiments, etc.)
+          associated with it</strong
+        >.
+      </b-alert>
     </confirmation-button>
   </b-card>
 </template>