Changeset 297

Show
Ignore:
Timestamp:
03/01/06 13:40:54 (3 years ago)
Author:
lazyatom
Message:

Merged rb_1.0 (r296) changes into trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • user_engine/trunk/app/controllers/role_controller.rb

    r149 r297  
    4040  def list 
    4141    @content_columns = Role.content_columns 
    42     @role_pages, @roles = paginate :role, :per_page => 10 
     42    @role_pages, @roles = paginate :role, :per_page => 10, :order => 'system_role desc, name' 
    4343  end 
    4444 

  • user_engine/trunk/app/controllers/user_controller.rb

    r166 r297  
    3535  def list 
    3636    @content_columns = user_content_columns_to_display     
    37     @user_pages, @all_users = paginate :user, :per_page => 10         
     37    @user_pages, @all_users = paginate :user, :per_page => 10, :order => 'firstname, lastname'        
    3838  end 
    3939 
    …… 
    4242  def edit_user 
    4343    if (@user = find_user(params[:id])) 
    44       @all_roles = Role.find_all.select { |r| r.name != UserEngine.config(:guest_role_name) } 
     44      @all_roles = Role.find(:all, :order => "system_role desc, name").select { |r| r.name != UserEngine.config(:guest_role_name) } 
    4545      case request.method 
    4646        when :get 

  • user_engine/trunk/app/views/role/_form.rhtml

    r117 r297  
    2929    </tr></thead> 
    3030    <tbody><tr> 
    31   <% @all_actions.each_key do |controller_name| 
     31        <% @all_actions.sort.each do |controller_name, permissions| 
    3232        controller_id = controller_name.gsub("/", "_") %> 
    33         <td><ul> 
    34   <%      @all_actions[controller_name].each do |permission| %> 
    35         <li><input type="checkbox" id="<%= controller_id + "_" + permission.action %>" name="permissions_<%= controller_id %>[]" value="<%= permission.id %>" <% if @role.permissions.include?(permission) %>checked="checked"<% end %>/><%= link_if_authorized(permission.action.capitalize, {:controller => "permission", :action => "show", :id => permission}, {:title => permission.description, :show_text => true}) %></li> 
    36   <%  end %> 
    37       </ul></td> 
    38   <% end %> 
     33        <td> 
     34          <ul> 
     35            <% permissions.sort_by{|p| p.action}.each do |permission| %> 
     36            <li><input type="checkbox" id="<%= controller_id + "_" + permission.action %>" name="permissions_<%= controller_id %>[]" value="<%= permission.id %>" <% if @role.permissions.include?(permission) %>checked="checked"<% end %>/><%= link_if_authorized(permission.action.capitalize, {:controller => "permission", :action => "show", :id => permission}, {:title => permission.description, :show_text => true}) %></li> 
     37            <% end %> 
     38        </ul></td> 
     39        <% end %> 
    3940    </tr></tbody> 
    4041  </table> 

  • user_engine/trunk/app/views/role/show.rhtml

    r141 r297  
    1111  <table id="role_permission_table"> 
    1212    <thead><tr> 
    13   <% @all_actions.each_key do |controller_name| %> 
     13  <% @all_actions.sort.each do |controller_name,permissions| %> 
    1414        <th><%= controller_name.capitalize %></th> 
    1515  <% end %> 
    1616    </tr></head> 
    1717    <tbody><tr> 
    18   <% @all_actions.each_key do |controller_name| %> 
     18  <% @all_actions.sort.each do |controller_name,permissions| %> 
    1919      <td><ul> 
    20   <% @all_actions[controller_name].each do |permission| %> 
     20          <% permissions.sort_by{|p| p.action}.each do |permission| %> 
    2121        <li><strong><%= link_if_authorized(permission.action.capitalize, {:controller => "permission", :action => "show", :id => permission}, :show_text => true, :title => permission.description) %></strong><br> 
    22     <%= permission.description %></li>   
    23   <% end %> 
     22        <%= permission.description %></li>   
     23    <% end %> 
    2424      </ul></td> 
    2525  <% end %> 
    …… 
    2929  <h2>Users</h2> 
    3030  <ul id="role_user_list"> 
    31     <% @role.users.each do |user| %> 
     31    <% @role.users.sort_by{|u| u.fullname}.each do |user| %> 
    3232      <%= link_if_authorized user.fullname, {:controller => "user", :action => "show", :id => user.id}, {:show_text => true, :wrap_in => 'li', :title => user.login } %> 
    3333    <% end %> 
    …… 
    3939  <%= link_if_authorized 'List', {:action => 'list'}, {:wrap_in => 'li'} %> 
    4040</ul> 
     41 

  • user_engine/trunk/app/views/user/show.rhtml

    r117 r297  
    99  <h2>Roles</h2> 
    1010  <ul id="user_role_list"> 
    11     <% @user.roles.each do |role| %> 
     11    <% @user.roles.sort_by{|r| r.name}.each do |role| %> 
    1212    <%= link_if_authorized role.name, {:controller => 'role', :action => 'show', :id => role}, {:wrap_in => 'li', :title => role.description, :show_text => true} %> 
    1313    <% end %> 

  • user_engine/trunk/lib/user_engine.rb

    r293 r297  
    4646   
    4747  config :user_role_table, "#{config(:role_table)}_#{LoginEngine.config(:user_table)}" 
    48   config :permission_role_table, "#{config(:raw_permission_table)}_#{config(:raw_role_table)}" 
     48  config :permission_role_table, "#{config(:permission_table)}_#{config(:role_table)}" 
    4949 
    5050  # The names of the Guest and User roles