From 36be4202da385aac5f17668e95e205f930998973 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 12 Dec 2011 16:12:27 +0000
Subject: [PATCH] fix user edit/creation form in admin part

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1213293 13f79535-47bb-0310-9956-ffa450edef68
---
 .../js/redback/templates/user-edit.html       |  4 +--
 .../js/redback/templates/user-grids.html      |  1 +
 .../src/main/webapp/js/redback/user.js        | 15 ++++++++++-
 .../src/main/webapp/js/redback/users.js       | 27 ++++++-------------
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
index 2a17d993e..115b3cb97 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
@@ -4,7 +4,7 @@
         <div class="clearfix">
           <label for="username">${i18n('username')}</label>
           <div class="input" id="username-div">
-            {{if $data.username}}
+            {{if $data.username.length>0}}
               <span class="uneditable-input">${$data.username}</span>
             {{else}}
               <input type="text" id="username" name="username" size="30" class="required" data-bind="value: username"/>
@@ -55,6 +55,6 @@
         </div>
       </fieldset>
       <button data-bind="click: save" class="btn" id="user-create-form-register-button">${i18n('save')}</button>
-      <button onclick="$('#user-create').hide()" class="btn" id="user-create-form-cancel-button">${i18n('cancel')}</button>
+      <button class="btn" id="user-create-form-cancel-button">${i18n('cancel')}</button>
     </form>
 </script>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
index fde561086..ca6d41cf2 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
@@ -68,6 +68,7 @@
           </tr>
       {{/each}}
   </tbody>
+
 </script>
 
 <script id="ko_usersGrid_pageLinks" type="text/x-jquery-tmpl">
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 43d39b7e0..1fcb8716a 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
@@ -47,6 +47,11 @@ $(function() {
         }
       };
       this.createUser = function() {
+        $.log("user#createUser");
+        var valid = $("#user-create").valid();
+        if (!valid) {
+            return;
+        }
         var currentUser = this;
         $.ajax("restServices/redbackServices/userService/createUser", {
             data: "{\"user\": " +  ko.toJSON(this)+"}",
@@ -158,7 +163,15 @@ $(function() {
       this.save=function(){
         $.log("user.save create:"+window.redbackModel.createUser);
         if (window.redbackModel.createUser==true){
-          return this.create();
+          var valid = $("#main-content #createUserForm #user-create").valid();
+
+          if (valid==false) {
+            $.log("user#save valid:false");
+            return;
+          } else {
+            $.log("user#save valid:true");
+            return this.create();
+          }
         } else {
           return this.update();
         }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
index a2bf9bdd2..7a8781fdf 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
@@ -54,12 +54,12 @@ $(function() {
     });
 
     this.addUser=function() {
-      screenChange();
+      clearUserMessages();
       window.redbackModel.createUser=true;
       $("#main-content #user-edit").remove();
       $('#main-content #user-create').show();
       ko.renderTemplate("redback/user-edit-tmpl", new user(), null, $("#createUserForm").get(0),"replaceChildren");
-      $("#user-create").delegate("#user-create-form-cancel-button", "click keydown", function(e) {
+      $("#main-content #createUserForm #user-create").delegate("#user-create-form-cancel-button", "click keydown", function(e) {
         e.preventDefault();
         $('#user-create').hide();
       });
@@ -73,13 +73,8 @@ $(function() {
           customShowError(validator,errorMap,errorMap);
         }
       });
-      $("#createUserForm #user-create").delegate("#user-create-form-save-button", "click keydown", function(e) {
+      $("#main-content #createUserForm #user-create").delegate("#user-create-form-register-button", "click keydown", function(e) {
         e.preventDefault();
-        var valid = $("#user-create").valid();
-        if (!valid) {
-            return;
-        }
-        user.createUser();
       });
     };
 
@@ -110,7 +105,7 @@ $(function() {
 
     this.editUserBox=function(user) {
       window.redbackModel.createUser=false;
-      screenChange();
+      clearUserMessages();
       $("#main-content #user-edit").remove();
       $("#main-content").append("<div id='user-edit'></div>");
       $("#main-content #user-edit").attr("data-bind",'template: {name:"redback/user-edit-tmpl",data: user}');
@@ -120,20 +115,13 @@ $(function() {
       var viewModel = new userViewModel(user);
 
       ko.applyBindings(viewModel,$("#main-content #user-edit").get(0));
-      jQuery("#main-content #user-create").validate({
-        rules: {
-          confirmPassword: {
-            equalTo: "#password"
-          }
-        },
-        showErrors: function(validator, errorMap, errorList) {
-          customShowError(validator,errorMap,errorMap);
-        }
-      });
+
+
       $("#main-content #user-create").delegate("#user-create-form-cancel-button", "click keydown", function(e) {
         e.preventDefault();
         $('#main-content #user-create').remove();
       });
+
       $("#main-content #user-create").validate({
         rules: {
           confirmPassword: {
@@ -152,6 +140,7 @@ $(function() {
         }
         user.update();
       });
+
     }
 
   }
-- 
2.39.5