Author: olamy
Date: Sat Dec 31 13:56:12 2011
New Revision: 1226094
URL: http://svn.apache.org/viewvc?rev=1226094&view=rev
Log:
fix roles grid due to new js bean mapping
Modified:
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/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=1226094&r1=1226093&r2=1226094&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 13:56:12 2011
@@ -54,6 +54,28 @@ $(function() {
}
}
+ /**
+ * view model used for roles grid
+ */
+ rolesViewModel=function() {
+ this.roles = ko.observableArray([]);
+
+ this.loadRoles = function() {
+ $.ajax("restServices/redbackServices/roleManagementService/allRoles", {
+ type: "GET",
+ async: false,
+ dataType: 'json',
+ success: function(data) {
+ var mappedRoles = $.map(data.role, function(item) {
+ return mapRole(item);
+ });
+ self.roles(mappedRoles);
+ }
+ }
+ );
+ };
+
+ }
displayRolesGrid = function(){
@@ -69,7 +91,8 @@ $(function() {
});
$.log(ko.toJSON(roles));
$("#main-content").html($("#rolesTabs").tmpl());
- $("#main-content #roles-view-tabs-content
#roles-view").html($("#rolesGrid").tmpl(roles));
+ var data = {roles: roles};
+ $("#main-content #roles-view-tabs-content
#roles-view").html($("#rolesGrid").tmpl(data));
$("#roles-view-tabs").tabs();
activateRolesGridTab();
}
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=1226094&r1=1226093&r2=1226094&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 13:56:12 2011
@@ -8,7 +8,7 @@
</tr>
</thead>
<tbody>
- {{each role}}
+ {{each roles}}
<tr>
<td>${$value.name}</td>
<td>${$value.description}</td>
@@ -69,18 +69,18 @@
<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}}
- <!--
+
<div class="page-header">
<h3>${$.i18n.prop('role.model.child.roles')}</h3>
</div>
@@ -167,5 +167,5 @@
{{else}}
${$.i18n.prop('role.edit.no.user.defined')}
{{/if}}
- -->
+
</script>
