From d0c698bf1041f3cf13e012fcadd211b450a7883a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 23 Nov 2012 09:34:25 +0000
Subject: [PATCH] [MRM-1708] When using LDAP, users can still edit their
 details upon login. finish ui part.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1412797 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/js/redback/user.js        |  4 +-
 .../webapp/js/templates/redback/login.html    | 46 ----------------
 .../js/templates/redback/user-edit.html       | 54 +++++++++++++++++++
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index 4b236c0af..3f01050d6 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -693,7 +693,9 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
     var editUserDetailViewModel=new EditUserDetailViewModel(currentUser);
     ko.applyBindings(editUserDetailViewModel,$("#modal-user-edit-content").get(0));
 
-    //$("#modal-user-edit-content").html($("#modal-user-edit-tmpl").tmpl({user: currentUser} ));
+    if(currentUser.readOnly){
+      $("#modal-user-edit-footer" ).hide();
+    }
 
     window.modalEditUserBox.modal('show');
     $("#user-edit-form").validate({
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
index 15c0397b4..808c1660f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
@@ -138,51 +138,5 @@
   </div>
 </div>
 
-<script type="text/html" id="modal-user-edit-tmpl">
 
-    <form id="user-edit-form" class="form-horizontal">
-      <div id="modal-user-edit-err-message" class="alert-message error" style="display:none"></div>
-      <fieldset>
-        <div class="control-group">
-          <label class="control-label" for="username">${$.i18n.prop('username')}</label>
-          <div class="controls" id="username-div">
-            <span class="uneditable-input" data-bind="text: user.username"></span>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
-          <div class="controls">
-            <input type="text" id="fullname" name="fullname" size="30" class="required" data-bind="value: user.fullName"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
-          <div class="controls">
-            <input type="text" id="email" name="email" size="30" class="required email" data-bind="value: user.email"/>
-          </div>
-        </div>
-        <div class="control-group" id="user-edit-form-current-password-div">
-          <label class="control-label" for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
-          <div class="controls">
-            <input type="password" id="userEditFormCurrentPassword" name="userEditFormCurrentPassword" class="required" value=""/>
-          </div>
-        </div>
-
-        <div class="control-group">
-          <label class="control-label" for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
-          <div class="controls">
-            <input type="password" id="userEditFormNewPassword" name="userEditFormNewPassword" class="" value=""/>
-          </div>
-        </div>
-
-        <div class="control-group">
-          <label class="control-label" for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
-          <div class="controls">
-            <input type="password" id="userEditFormNewPasswordConfirm" name="userEditFormNewPasswordConfirm" class="" value=""/>
-          </div>
-        </div>
-      </fieldset>
-    </form>
-
-</script>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
index f5051e042..7715cfa8e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
@@ -480,5 +480,59 @@
 </script>
 
 
+<script type="text/html" id="modal-user-edit-tmpl">
 
+    <form id="user-edit-form" class="form-horizontal">
+      <div id="modal-user-edit-err-message" class="alert-message error" style="display:none"></div>
+      <fieldset>
+        <div class="control-group">
+          <label class="control-label" for="username">${$.i18n.prop('username')}</label>
+          <div class="controls" id="username-div">
+            <span class="uneditable-input" data-bind="text: user.username"></span>
+          </div>
+        </div>
+        <div class="control-group">
+          <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
+          <div class="controls">
+              {{if user.readOnly}}
+                <span class="uneditable-input" data-bind="text: user.fullName"></span>
+              {{else}}
+                <input type="text" id="fullname" name="fullname" size="30" class="required" data-bind="value: user.fullName"/>
+              {{/if}}
+          </div>
+        </div>
+        <div class="control-group">
+          <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
+          <div class="controls">
+            {{if user.readOnly}}
+              <span class="uneditable-input" data-bind="text: user.email"></span>
+            {{else}}
+              <input type="text" id="email" name="email" size="30" class="required email" data-bind="value: user.email"/>
+            {{/if}}
+          </div>
+        </div>
+        <div class="control-group" id="user-edit-form-current-password-div">
+          <label class="control-label" for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
+          <div class="controls">
+            <input type="password" id="userEditFormCurrentPassword" name="userEditFormCurrentPassword" class="required" value=""/>
+          </div>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label" for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
+          <div class="controls">
+            <input type="password" id="userEditFormNewPassword" name="userEditFormNewPassword" class="" value=""/>
+          </div>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label" for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
+          <div class="controls">
+            <input type="password" id="userEditFormNewPasswordConfirm" name="userEditFormNewPasswordConfirm" class="" value=""/>
+          </div>
+        </div>
+      </fieldset>
+    </form>
+
+</script>
 
-- 
2.39.5