Merge pull request #282 from awf-dbca/sso-url-adjustment

SSO setting url dynamic
dbca-wa · Aug 2, 2024 · 0e22174 · 0e22174
2 parents c824fc5 + 0faef17
commit 0e22174
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...lifecompliance/frontend/wildlifecompliance/src/components/user/manage_my_user_details.vue b/...lifecompliance/frontend/wildlifecompliance/src/components/user/manage_my_user_details.vue
@@ -32,7 +32,7 @@
                           <div class="form-group">
                             <label for="" class="col-sm-3 control-label"></label>
                             <div class="col-sm-6">
-                            <b>To update your account name please <a :href="current_user.sso_setting_url">click here</a>:</b>
+                            <b>To update your account name please <a :href="current_user.sso_setting_url+'/sso/setting?back='+current_url">click here</a>:</b>
                             </div>
                           </div>
                           <div class="form-group">
@@ -504,6 +504,9 @@ export default {
   
     },
     computed: {
+        current_url: function() {
+            return window.location.href;
+        },
         canUpdateDOB: function() {
             return (this.current_user.legal_dob === null || this.current_user.legal_dob === "")
         },

diff --git a/wildlifecompliance/templates/wildlifecompliance/user_profile.html b/wildlifecompliance/templates/wildlifecompliance/user_profile.html
@@ -39,7 +39,7 @@ <h3 class="panel-title">Personal Details <small>Provide your personal details</s
                           <div class="form-group">
                             <label for="" class="col-sm-3 control-label"></label>
                             <div class="col-sm-6">
-                            <b>To update your account name please <a href='{{sso_setting_url}}'>click here</a>:</b>
+                            <b>To update your account name please <a href='javascript:function(){return "{{sso_setting_url}}/sso/setting?back="+window.location.href";}'+>click here</a>:</b>
                             </div>
                           </div>
                           <div class="form-group">