Changeset 2078

Timestamp:

Mar 15, 2006, 10:53:10 AM (17 years ago)

Author:

Martin Svensson

Message:

Name of item types in view_role now agree with the names of item types in edit_role.
Fixes #123

Location:

trunk/www/admin/roles

Files:

• edit_role.jsp (modified) (1 diff)
• view_role.jsp (modified) (1 diff)

trunk/www/admin/roles/edit_role.jsp

@@ -379 +379 @@
     <tr valign="top">
     <td>
-      <b>Items types</b><br>
+      <b>Item types</b><br>
       <select name="items" size="15" onChange="showPermissions(this[this.selectedIndex].value);" multiple>
       <%

trunk/www/admin/roles/view_role.jsp

@@ -303 +303 @@
               newItems++;
               Item item = items.get(index);
-              sb.append("<td class=\"cell\"><b>").append(item.toString()).append("</b></td>");
+              int keyId = SystemItems.getRoleKeyId(item);
+              RoleKey key = RoleKey.getById(dc, keyId);
+              
+              sb.append("<td class=\"cell\"><b>").append(key.getName()).append("</b></td>");
               sb.append("<td class=\"cell\">");
-              
-              int keyId = SystemItems.getRoleKeyId(item);
+                            
               if (keyId != 0)
-              {
-                RoleKey key = RoleKey.getById(dc, keyId);
+              {               
                 Set<Permission> permissions = key.getPermissions(role);
                 sb.append(getShortPermissions(item, permissions));