Author: olamy
Date: Thu Jan 5 15:45:26 2012
New Revision: 1227644
URL: http://svn.apache.org/viewvc?rev=1227644&view=rev
Log:
fix NPE when role doesn't have any users affected
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=1227644&r1=1227643&r2=1227644&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
Thu Jan 5 15:45:26 2012
@@ -24,7 +24,7 @@ $(function() {
this.assignable = ko.observable(assignable);
this.childRoleNames = ko.observableArray(childRoleNames);//read only
this.parentRoleNames = ko.observableArray(parentRoleNames);//read only
- this.users = ko.observableArray(users);
+ this.users = ko.observableArray(users?users:new Array());
this.parentsRolesUsers = ko.observableArray(parentsRolesUsers);//read only
this.permissions = ko.observableArray(permissions);//read only
// when editing a role other users not assign to this role are populated
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=1227644&r1=1227643&r2=1227644&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
Thu Jan 5 15:45:26 2012
@@ -129,12 +129,9 @@
{{else}}
${$.i18n.prop('role.edit.no.user.defined')}
{{/if}}
-
- <input class="btn" type="button" id="role-list-users-update-mode"
data-bind="click: updateMode" value="${$.i18n.prop('role.update.mode')}"/>
-
</div>
- <div id="role-edit-users" class="clearfix ar-multiselect"
style="display:none">
+ <div id="role-edit-users" class="clearfix ar-multiselect">
<div class="ar-multiselect-column ar-multiselect-left">
<select data-bind="options: otherUsers ,optionsText:
'username',selectedOptions:selectedOtherUsers" multiple="true"
id="role-edit-available-users"></select>
@@ -149,8 +146,6 @@
<select data-bind="options: users ,optionsText:
'username',selectedOptions:selectedUsers" multiple="true"
id="role-edit-affected-users"></select>
</div>
<button class="btn" id="role-edit-users-save" data-bind="click:
saveUsers">${$.i18n.prop('save')}</button>
- <br/>
- <input class="btn" id="role-edit-users-view-mode" type="button"
data-bind="click: viewMode" value="${$.i18n.prop('role.view.mode')}"/>
</div>
</script>
