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/12 15:12:05 UTC
svn commit: r1230552 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback:
templates/user-edit.html user.js users.js
Author: olamy
Date: Thu Jan 12 14:12:05 2012
New Revision: 1230552
URL: http://svn.apache.org/viewvc?rev=1230552&view=rev
Log:
modify user roles display binding as we will modify this we need an observable array
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/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=1230552&r1=1230551&r2=1230552&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 Thu Jan 12 14:12:05 2012
@@ -90,7 +90,7 @@
</div>
<div>
<ul>
- {{each $data.roles}}
+ {{each $data.user.assignedRoles}}
<li>${$value.name}</li>
{{/each}}
</ul>
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=1230552&r1=1230551&r2=1230552&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 Thu Jan 12 14:12:05 2012
@@ -51,6 +51,7 @@ $(function() {
// admin only
this.locked = ko.observable(locked);
this.passwordChangeRequired = ko.observable(passwordChangeRequired);
+ this.assignedRoles = ko.observableArray(new Array());
this.remove = function() {
if (ownerViewModel) {
ownerViewModel.users.destroy(this);
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=1230552&r1=1230551&r2=1230552&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 Thu Jan 12 14:12:05 2012
@@ -160,9 +160,12 @@ $(function() {
dataType: 'json',
success: function(data) {
var mappedRoles = $.map(data.role, function(item) {
- return mapRole(item);
+ var r = mapRole(item);
+ viewModel.user.assignedRoles.push(r);
+ return r;
});
viewModel.roles=mappedRoles;
+
$("#main-content #user-edit-roles-view").attr("data-bind",'template: {name:"user_edit_roles_tmpl"}');
ko.applyBindings(viewModel,$("#user-edit-roles-view").get(0));
$("#main-content #edit_user_details_pills_headers").pills();
@@ -187,11 +190,13 @@ $(function() {
$("#user-edit-roles-edit").html(smallSpinnerImg());
$.ajax("restServices/redbackServices/roleManagementService/getApplicationRoles/"+encodeURIComponent(user.username()), {
type: "GET",
- async: false,
dataType: 'json',
success: function(data) {
$("#user-edit-roles-edit").html("loaded");
-
+ var mappedApplicationRoles = $.map(data.applicationRole, function(item) {
+ return mapApplicationRoles(item);
+ });
+ $.log("applicationRoles length:"+mappedApplicationRoles.length);
}
}
);