index.xhtml in zen-0.2.5

- old
+ new

@@ -16,11 +16,12 @@
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
                     
                     <th>#{lang('access_rules.labels.id')}</th>
-                    <th>#{lang('access_rules.labels.extension')}</th>
+                    <th>#{lang('access_rules.labels.package')}</th>
+                    <th>#{lang('access_rules.labels.controller')}</th>
                     <th>#{lang('access_rules.labels.create')}</th>
                     <th>#{lang('access_rules.labels.read')}</th>
                     <th>#{lang('access_rules.labels.update')}</th>
                     <th>#{lang('access_rules.labels.delete')}</th>
                     <th>#{lang('access_rules.labels.user')}</th>
@@ -35,20 +36,21 @@
                         <input type="checkbox" name="access_rule_ids[]" value="#{rule.id}" />
                     </td>
                     <?r end ?>
                     
                     <td>#{rule.id}</td>
-                    
+                    <td>#{rule.package}</td>
+
                     <?r if user_authorized?([:update]) ?>
                     <td>
                         #{anchor_to(
-                          rule.extension, 
-                          Users::Controllers::AccessRules.r(:edit, rule.id)
+                          @form_controllers[rule.package].key(rule.controller), 
+                          Users::Controller::AccessRules.r(:edit, rule.id)
                         )}
                     </td>
                     <?r else ?>
-                    <td>#{rule.extension}</td>
+                    <td>#{@form_controllers[rule.package].key(rule.controller)}</td>
                     <?r end ?>
                     
                     <td>#{@boolean_hash.invert[rule.create_access]}</td>
                     <td>#{@boolean_hash.invert[rule.read_access]}</td>
                     <td>#{@boolean_hash.invert[rule.update_access]}</td>
@@ -76,10 +78,10 @@
             
             <?r if user_authorized?([:create]) ?>
             <div class="button">
                 #{anchor_to(
                   lang('access_rules.buttons.new'), 
-                  Users::Controllers::AccessRules.r(:new)
+                  Users::Controller::AccessRules.r(:new)
                 )}
             </div>
             <?r end ?>
             
             <?r if user_authorized?([:delete]) and @access_rules and !@access_rules.empty? ?>