Author: olamy
Date: Mon Jan 16 16:53:26 2012
New Revision: 1232061
URL: http://svn.apache.org/viewvc?rev=1232061&view=rev
Log:
add managedRepository form validation rules
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1232061&r1=1232060&r2=1232061&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Mon Jan 16 16:53:26 2012
@@ -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);
+ }
+ });
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1232061&r1=1232060&r2=1232061&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
Mon Jan 16 16:53:26 2012
@@ -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">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1232061&r1=1232060&r2=1232061&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Mon Jan 16 16:53:26 2012
@@ -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());
