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/31 15:44:20 UTC
svn commit: r1226095 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/utils.js redback/roles.js redback/templates/roles-tmpl.html
Author: olamy
Date: Sat Dec 31 14:44:19 2011
New Revision: 1226095
URL: http://svn.apache.org/viewvc?rev=1226095&view=rev
Log:
fix js bean role mapping when users are array or not
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1226095&r1=1226094&r2=1226095&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Sat Dec 31 14:44:19 2011
@@ -179,17 +179,14 @@ openDialogConfirmui=function(okFn, okMes
}
mapStringArray=function(data){
- //if (data){
- if ($.isArray(data)){
- $.log("isArray");
- return $.map(data,function(item){
- return item;
- });
- } else {
- $.log("not Array");
- return new Array(data);
- }
- //}
+ if ($.isArray(data)){
+ //$.log("isArray");
+ return $.map(data,function(item){
+ return item;
+ });
+ } else {
+ //$.log("not Array");
+ return [data];
+ }
- //return null;
}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js?rev=1226095&r1=1226094&r2=1226095&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js Sat Dec 31 14:44:19 2011
@@ -81,7 +81,7 @@ $(function() {
displayRolesGrid = function(){
$("#user-messages").html("");
$("#main-content").html("");
- $.ajax("restServices/redbackServices/roleManagementService/allRoles",
+ $.ajax("restServices/redbackServices/roleManagementService/detailledAllRoles",
{
type: "GET",
dataType: 'json',
@@ -89,7 +89,7 @@ $(function() {
var roles = $.map(data.role, function(item) {
return mapRole(item);
});
- $.log(ko.toJSON(roles));
+ //$.log(ko.toJSON(roles));
$("#main-content").html($("#rolesTabs").tmpl());
var data = {roles: roles};
$("#main-content #roles-view-tabs-content #roles-view").html($("#rolesGrid").tmpl(data));
@@ -128,20 +128,20 @@ $(function() {
*/
mapRole=function(data) {
// name, description, assignable,childRoleNames,parentRoleNames,users,parentsRolesUsers,permissions
- $.log("mapRole:"+data.name+":");
+ //$.log("mapRole:"+data.name+":");
var childRoleNames = mapStringArray(data.childRoleNames);
var parentRoleNames = mapStringArray(data.parentRoleNames);
- var users = data.users ? $.map(data.users, function(item) {
+ var users = data.users ? $.isArray(data.users) ? $.map(data.users, function(item) {
return mapUser(item);
- }):null;
+ }):[mapUser(data.users)]:null;
- var parentsRolesUsers = data.parentsRolesUsers ? $.map(data.parentsRolesUsers, function(item) {
+ var parentsRolesUsers = data.parentsRolesUsers ? $.isArray(data.parentsRolesUsers)? $.map(data.parentsRolesUsers, function(item) {
return mapUser(item);
- }):null;
+ }):[mapUser(data.parentsRolesUsers)]:null;
var permissions = data.permissions? $.isArray(data.permissions) ? $.map(data.permissions, function(item){
return mapPermission(item);
- }): new Array(mapPermission(data.permissions)) :null;
+ }): [mapPermission(data.permissions)] :null;
return new role(data.name, data.description,data.assignable,childRoleNames,parentRoleNames,users,parentsRolesUsers,permissions);
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html?rev=1226095&r1=1226094&r2=1226095&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html Sat Dec 31 14:44:19 2011
@@ -69,14 +69,14 @@
<div class="page-header">
<h3>${$.i18n.prop('role.model.parent.roles')}</h3>
</div>
- {{if parentRoleNames()}}
+ {{if parentRoleNames}}
<ul>
- {{if $.isArray(parentRoleNames())}}
- {{each parentRoleNames()}}
+ {{if $.isArray(parentRoleNames)}}
+ {{each parentRoleNames}}
<li>${$value}</li>
{{/each}}
{{else}}
- <li>${parentRoleNames()}</li>
+ <li>${parentRoleNames}</li>
{{/if}}
</ul>
{{/if}}