From 76ac3cc60177b10340ae3ea7c6523dc9f976f774 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 16 Jan 2012 16:53:26 +0000
Subject: [PATCH] add managedRepository form validation rules

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1232061 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/js/archiva/repositories.js  | 17 +++++++++++++++++
 .../js/archiva/templates/repositories.html      | 10 +++++-----
 .../src/main/webapp/js/redback/user.js          |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index 96ed1e95d..e0472b290 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -72,6 +72,10 @@ $(function() {
     this.update = update;
 
     save=function(){
+      var valid = $("#main-content #managed-repository-edit-form").valid();
+      if (valid==false) {
+          return;
+      }
       $.log("save:"+this.managedRepository().name());
       clearUserMessages();
       $.ajax("restServices/archivaServices/managedRepositoriesService/updateManagedRepository",
@@ -108,6 +112,19 @@ $(function() {
       ko.applyBindings(viewModel,$("#main-content #managed-repository-edit").get(0));
       activateManagedRepositoryEditTab();
       $("#managed-repository-edit-li a").html($.i18n.prop('edit'));
+      $("#main-content #managed-repository-edit-form").validate({
+        rules: {
+          daysOlder : {
+            digits: true
+          },
+          retentionCount : {
+            digits: true
+          }
+        },
+        showErrors: function(validator, errorMap, errorList) {
+          customShowError(validator,errorMap,errorMap);
+        }
+      });
     }
 
   }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
index 24dc3a3a3..ebd9d1892 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
@@ -108,7 +108,7 @@
             {{if update}}
               <span class="uneditable-input">${$data.managedRepository().id}</span>
             {{else}}
-              <input type="text" class="xlarge" id="id" name="id" size="50" class="required"
+              <input type="text" class="xlarge required" id="id" name="id" size="50"
                      data-bind="value: managedRepository().id,css:{'uneditable-input': update},readonly:update"/>
             {{/if}}
           </div>
@@ -116,14 +116,14 @@
         <div class="clearfix">
           <label for="name">${$.i18n.prop('name')}</label>
           <div class="input">
-            <input type="text" class="xlarge" id="name" name="name" size="50" class="required"
+            <input type="text" class="xlarge required" id="name" name="name" size="50"
                    data-bind="value: managedRepository().name"/>
           </div>
         </div>
         <div class="clearfix">
           <label for="location">${$.i18n.prop('directory')}</label>
           <div class="input">
-            <input type="text" class="xlarge" id="location" name="location" size="50" class="required" data-bind="value: managedRepository().location"/>
+            <input type="text" class="xlarge required" id="location" name="location" size="50" data-bind="value: managedRepository().location"/>
           </div>
         </div>
         <div class="clearfix">
@@ -135,13 +135,13 @@
         <div class="clearfix">
           <label for="cronExpression">${$.i18n.prop('cronExpression')}</label>
           <div class="input">
-            <input type="text" id="cronExpression" name="daysOlder" size="40" data-bind="value: managedRepository().cronExpression"/>
+            <input type="text" id="cronExpression" class="required" name="cronExpression" size="40" data-bind="value: managedRepository().cronExpression"/>
           </div>
         </div>
         <div class="clearfix">
           <label for="daysOlder">${$.i18n.prop('daysOlder')}</label>
           <div class="input">
-            <input type="text" id="daysOlder" name="daysOlder" size="5" data-bind="value: managedRepository().daysOlder"/>
+            <input type="text" id="daysOlder" class="digits" name="daysOlder" size="5" data-bind="value: managedRepository().daysOlder"/>
           </div>
         </div>
         <div class="clearfix">
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 e9633e555..55813d881 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
@@ -569,7 +569,7 @@ $(function() {
    */
   changePassword=function(previousPassword,registration,user){
     var valid = $("#password-change-form").valid();
-    if (!valid) {
+    if (valid==false) {
         return;
     }
     $('#modal-password-change-footer').append(smallSpinnerImg());
-- 
2.39.5