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/01 01:45:54 UTC
svn commit: r1226203 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/utils.js js/redback/roles.js
js/redback/templates/roles-tmpl.html
Author: olamy
Date: Sun Jan 1 00:45:53 2012
New Revision: 1226203
URL: http://svn.apache.org/viewvc?rev=1226203&view=rev
Log:
role edit detail with knockout
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
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/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1226203&r1=1226202&r2=1226203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Sun Jan 1 00:45:53 2012
@@ -60,6 +60,7 @@
.script("bootstrap-alerts.js").wait()
.script("bootstrap-dropdown.js").wait()
.script("knockout.simpleGrid.js").wait()
+ .script("knockout.mapping-latest.debug.js").wait()
.script("redback/user.js").wait()
.script("redback/users.js").wait()
.script("redback/redback.js").wait()
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=1226203&r1=1226202&r2=1226203&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 Sun Jan 1 00:45:53 2012
@@ -191,14 +191,14 @@ openDialogConfirmui=function(okFn, okMes
}
mapStringArray=function(data){
- if ($.isArray(data)){
- //$.log("isArray");
- return $.map(data,function(item){
- return item;
- });
- } else {
- //$.log("not Array");
- return [data];
+ if (data) {
+ if ($.isArray(data)){
+ return $.map(data,function(item){
+ return item;
+ });
+ } else {
+ return new Array(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=1226203&r1=1226202&r2=1226203&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 Sun Jan 1 00:45:53 2012
@@ -28,11 +28,6 @@ $(function() {
this.parentsRolesUsers = ko.observableArray(parentsRolesUsers);//read only
this.permissions = ko.observableArray(permissions);//read only
-
-
-
-
-
this.updateDescription=function(){
var url = "restServices/redbackServices/roleManagementService/updateRoleDescription?";
var roleName = this.name();
@@ -93,10 +88,30 @@ $(function() {
});
this.editRole=function(role){
- $("#main-content #roles-view-tabs-content #role-edit").attr("data-bind",'template: {name:"editRoleTab",data: role}');
+ $("#main-content #roles-view-tabs-content #role-edit").html(mediumSpinnerImg());
+ // load missing attributes
+ $.ajax("restServices/redbackServices/roleManagementService/getRole/"+role.name(),
+ {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var mappedRole = mapRole(data.role);
+ $("#main-content #roles-view-tabs-content #role-edit").attr("data-bind",'template: {name:"editRoleTab",data: role}');
+ role.parentRoleNames=mappedRole.parentRoleNames;
+ role.parentsRolesUsers=mappedRole.parentsRolesUsers;
+ role.users=mappedRole.users;
+ var viewModel = new roleViewModel(role);
+ ko.applyBindings(viewModel,$("#main-content #roles-view-tabs-content #role-edit").get(0));
+ activateRoleEditTab();
+ }
+ }
+ );
+
+
+ }
- var viewModel = new roleViewModel(role);
- ko.applyBindings(viewModel,$("#main-content #roles-view-tabs-content #role-edit").get(0));
+ this.saveRoleDescription=function(role){
+ $.log("saveRoleDescription:"+role.description);
}
}
@@ -113,43 +128,6 @@ $(function() {
$("#roles-view-tabs").tabs();
activateRolesGridTab();
removeMediumSpinnerImg();
- /*
- $.ajax("restServices/redbackServices/roleManagementService/detailledAllRoles",
- {
- type: "GET",
- dataType: 'json',
- success: function(data) {
- var roles = $.map(data.role, function(item) {
- return mapRole(item);
- });
- //$.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));
- $("#roles-view-tabs").tabs();
- activateRolesGridTab();
- },
- complete: function(){
- removeMediumSpinnerImg();
- }
- }
- );
- */
- }
-
- editRole = function(roleName){
- $.log("edit role:"+roleName);
- $.ajax("restServices/redbackServices/roleManagementService/getRole/"+roleName,
- {
- type: "GET",
- dataType: 'json',
- success: function(data) {
- var role = mapRole(data.role);
- $("#main-content #roles-view-tabs-content #role-edit").html($("#editRoleTab").tmpl(data.role));
- activateRoleEditTab();
- }
- }
- );
}
saveRoleDescription=function(){
@@ -174,15 +152,15 @@ $(function() {
var parentRoleNames = mapStringArray(data.parentRoleNames);
var users = data.users ? $.isArray(data.users) ? $.map(data.users, function(item) {
return mapUser(item);
- }):[mapUser(data.users)]:null;
+ }):new Array(mapUser(data.users)):null;
var parentsRolesUsers = data.parentsRolesUsers ? $.isArray(data.parentsRolesUsers)? $.map(data.parentsRolesUsers, function(item) {
return mapUser(item);
- }):[mapUser(data.parentsRolesUsers)]:null;
+ }):new Array(mapUser(data.parentsRolesUsers)):null;
var permissions = data.permissions? $.isArray(data.permissions) ? $.map(data.permissions, function(item){
return mapPermission(item);
- }): [mapPermission(data.permissions)] :null;
+ }): new Array(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=1226203&r1=1226202&r2=1226203&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 Sun Jan 1 00:45:53 2012
@@ -31,16 +31,16 @@
<tbody>
<tr>
<td>${$.i18n.prop('name')}:</td>
- <td id="role-edit-name">${name}</td>
+ <td id="role-edit-name">${$data.name}</td>
</tr>
<tr>
<td>${$.i18n.prop('description')}:</td>
- <td><input type="text" id="role-edit-description" value="${description}"></td>
+ <td><input type="text" id="role-edit-description" data-bind="value: description"></td>
</tr>
<tr>
<td colspan="2">
<div class="pull-left">
- <button class="btn" onclick="saveRoleDescription();">${$.i18n.prop('save')}</button>
+ <button class="btn" data-bind="click: saveRoleDescription">${$.i18n.prop('save')}</button>
</div>
</td>
</tr>
@@ -50,37 +50,30 @@
<div class="page-header">
<h3>${$.i18n.prop('role.model.parent.roles')}</h3>
</div>
- {{if parentRoleNames}}
+ {{if $data.parentRoleNames}}
<ul>
- {{if $.isArray(parentRoleNames)}}
- {{each parentRoleNames}}
+ {{each $data.parentRoleNames}}
<li>${$value}</li>
{{/each}}
- {{else}}
- <li>${parentRoleNames}</li>
- {{/if}}
+
</ul>
{{/if}}
<div class="page-header">
<h3>${$.i18n.prop('role.model.child.roles')}</h3>
</div>
- {{if childRoleNames}}
+ {{if $data.childRoleNames}}
<ul>
- {{if $.isArray(childRoleNames)}}
- {{each childRoleNames}}
+ {{each $data.childRoleNames}}
<li>${$value}</li>
{{/each}}
- {{else}}
- <li>${childRoleNames}</li>
- {{/if}}
</ul>
{{/if}}
<div class="page-header">
<h3>${$.i18n.prop('permissions')}</h3>
</div>
- {{if permissions}}
+ {{if $data.permissions}}
<table class="bordered-table zebra-striped" id="rolePermissionsTable">
<thead>
<tr>
@@ -90,21 +83,21 @@
</tr>
</thead>
<tbody>
- {{if $.isArray(permissions)}}
{{each permissions}}
<tr>
<td>${$value.name}</td>
- <td>${$value.operation.name}</td>
- <td>${$value.resource.identifier}</td>
+ {{if $value.operation }}
+ <td>${$value.operation.name}</td>
+ {{else}}
+ <td></td>
+ {{/if}}
+ {{if $value.resource }}
+ <td>${$value.resource.identifier}</td>
+ {{else}}
+ <td></td>
+ {{/if}}
</tr>
{{/each}}
- {{else}}
- <tr>
- <td>${permissions.name}</td>
- <td>${permissions.operation.name}</td>
- <td>${permissions.resource.identifier}</td>
- </tr>
- {{/if}}
</tbody>
</table>
{{/if}}
@@ -112,39 +105,27 @@
<div class="page-header">
<h2>${$.i18n.prop('role.edit.section.users')}</h2>
</div>
- {{if parentsRolesUsers}}
+ {{if $data.parentsRolesUsers}}
<div class="page-header">
<h3>${$.i18n.prop('role.edit.users.defined.in.parent.roles')}</h3>
</div>
- {{if $.isArray(parentsRolesUsers)}}
<ul>
- {{each parentsRolesUsers}}
+ {{each $data.parentsRolesUsers}}
<li>${$value.fullName} - ( ${$value.username} - ${$value.email} ) </li>
{{/each}}
</ul>
- {{else}}
- <ul>
- <li>${parentsRolesUsers.fullName} - ( ${parentsRolesUsers.username} - ${parentsRolesUsers.email} ) </li>
- </ul>
- {{/if}}
{{/if}}
<div class="page-header">
<h3>${$.i18n.prop('role.edit.users.defined.in.current.role')}</h3>
</div>
- {{if users}}
- {{if $.isArray(users)}}
+ {{if $data.users}}
<ul>
{{each users}}
<li>${$value.fullName} - ( ${$value.username} - ${$value.email} ) </li>
{{/each}}
</ul>
- {{else}}
- <ul>
- <li>${users.fullName} - ( ${users.username} - ${users.email} ) </li>
- </ul>
- {{/if}}
{{else}}
${$.i18n.prop('role.edit.no.user.defined')}
{{/if}}