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 2012/01/06 16:00:57 UTC
svn commit: r1228215 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback:
templates/user-edit.html templates/user-grids.html users.js
Author: olamy
Date: Fri Jan 6 15:00:56 2012
New Revision: 1228215
URL: http://svn.apache.org/viewvc?rev=1228215&view=rev
Log:
move display users roles to a knockout bind to prepare update mode
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/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=1228215&r1=1228214&r2=1228215&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 Fri Jan 6 15:00:56 2012
@@ -61,10 +61,11 @@
<button class="btn" id="user-create-form-cancel-button">${i18n('cancel')}</button>
</form>
</div>
- <div class="span6 columns" id="user-edit-roles-view" style="display:none">
+ <div class="span6 columns" id="user-edit-roles" style="display:none">
<div class="page-header">
<h3>${$.i18n.prop('effective.roles')}</h3>
</div>
+ <div id="user-edit-roles-view"></div>
</div>
</div>
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=1228215&r1=1228214&r2=1228215&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 Fri Jan 6 15:00:56 2012
@@ -99,6 +99,8 @@
<script id="user_edit_roles_tmpl" type="text/x-jquery-tmpl">
<ul>
- ${name}
+ {{each $data.roles}}
+ <li>${$value.name}</li>
+ {{/each}}
</ul>
</script>
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=1228215&r1=1228214&r2=1228215&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 Fri Jan 6 15:00:56 2012
@@ -61,7 +61,7 @@ $(function() {
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");
+ ko.renderTemplate("redback/user-edit-tmpl", new User(), null, $("#createUserForm").get(0),"replaceChildren");
$("#main-content #createUserForm #user-create").delegate("#user-create-form-cancel-button", "click keydown", function(e) {
e.preventDefault();
activateUsersGridTab();
@@ -146,13 +146,22 @@ $(function() {
user.update();
});
- $.ajax("restServices/redbackServices/roleManagementService/getEffectivelyAssignedRoles/"+user.username(), {
+ $("#user-edit-roles").show();
+ $( "#user-edit-roles-view" ).append(smallSpinnerImg());
+ $.ajax("restServices/redbackServices/roleManagementService/getEffectivelyAssignedRoles/"+encodeURIComponent(user.username()), {
type: "GET",
async: false,
dataType: 'json',
success: function(data) {
- $( "#user-edit-roles-view" ).append( jQuery("#user_edit_roles_tmpl" ).tmpl( data.role ) );
$("#user-edit-roles-view").show();
+ var mappedRoles = $.map(data.role, function(item) {
+ return mapRole(item);
+ });
+ //$( "#user-edit-roles-view" ).append( jQuery("#user_edit_roles_tmpl" ).tmpl( data.role ) );
+ viewModel.roles=mappedRoles;
+ $( "#user-edit-roles-view").attr("data-bind",'template: {name:"user_edit_roles_tmpl"}');
+ ko.applyBindings(viewModel,$("#user-edit-roles-view").get(0));
+ removeSmallSpinnerImg();
}
}
);
@@ -160,6 +169,11 @@ $(function() {
}
}
+ userViewModel=function(user) {
+ this.user=user;
+ this.roles = ko.observableArray(new Array());
+ }
+
/**
* called from the menu to display tabs with users grid
*/
@@ -185,12 +199,6 @@ $(function() {
$("#users-view-tabs-content #users-view").addClass("active");
}
-
-
- userViewModel=function(user) {
- this.user=user;
- }
-
activateUsersGridTab=function(){
$("#main-content #users-view-tabs li").removeClass("active");
$("#main-content #users-view-tabs-content div").removeClass("active");