You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/12 17:12:27 UTC
svn commit: r1213293 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback:
templates/user-edit.html templates/user-grids.html user.js users.js
Author: olamy
Date: Mon Dec 12 16:12:27 2011
New Revision: 1213293
URL: http://svn.apache.org/viewvc?rev=1213293&view=rev
Log:
fix user edit/creation form in admin part
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html?rev=1213293&r1=1213292&r2=1213293&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html Mon Dec 12 16:12:27 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html?rev=1213293&r1=1213292&r2=1213293&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html Mon Dec 12 16:12:27 2011
@@ -68,6 +68,7 @@
</tr>
{{/each}}
</tbody>
+
</script>
<script id="ko_usersGrid_pageLinks" type="text/x-jquery-tmpl">
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=1213293&r1=1213292&r2=1213293&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 Dec 12 16:12:27 2011
@@ -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();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1213293&r1=1213292&r2=1213293&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js Mon Dec 12 16:12:27 2011
@@ -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();
});
+
}
}