On Friday 21 of October 2011 04:06:59 Scott Seago wrote:
---
src/app/controllers/application_controller.rb | 5 +++--
src/app/controllers/permissions_controller.rb | 2 +-
src/app/views/permissions/_permissions.html.haml | 4 +++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/app/controllers/application_controller.rb
b/src/app/controllers/application_controller.rb index 049c227..4cf4476
100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -289,9 +289,10 @@ class ApplicationController < ActionController::Base
def set_permissions_header
@permission_list_header = [
{ :name => 'checkbox', :class => 'checkbox', :sortable =>
false },
- { :name => t("user"), :sort_attr => :last_name },
+ { :name => t('users.index.username') },
+ { :name => t('users.index.last_name'), :sortable => false },
+ { :name => t('users.index.first_name'), :sortable => false },
{ :name => t("role"), :sort_attr => :role},
- { :name => t("privileges")},
]
end
diff --git a/src/app/controllers/permissions_controller.rb
b/src/app/controllers/permissions_controller.rb index 7a9a5a4..26e8705
100644
--- a/src/app/controllers/permissions_controller.rb
+++ b/src/app/controllers/permissions_controller.rb
@@ -169,7 +169,7 @@ class PermissionsController < ApplicationController
def load_headers
@header = [
{ :name => '', :sortable => false },
- { :name => t('users.index.username'), :sortable => false },
+ { :name => t('users.index.username') },
{ :name => t('users.index.last_name'), :sortable => false },
{ :name => t('users.index.first_name'), :sortable => false },
{ :name => t('role'), :sortable => false }
diff --git a/src/app/views/permissions/_permissions.html.haml
b/src/app/views/permissions/_permissions.html.haml index 44f98da..d93e21c
100644
--- a/src/app/views/permissions/_permissions.html.haml
+++ b/src/app/views/permissions/_permissions.html.haml
@@ -13,7 +13,9 @@
- if check_privilege(Privilege::PERM_SET)
- selected = params[:select] == 'all'
= check_box_tag "permission_selected[]", permission.id, selected,
:id => "permission_checkbox_#{permission.id}" - %td= link_to
"#{permission.user.first_name} #{permission.user.last_name}",
user_path(permission.user) + %td= link_to permission.user.login,
user_path(permission.user) + %td= permission.user.last_name
+ %td= permission.user.first_name
- if check_privilege(Privilege::PERM_SET)
%td= select_tag "permission_role_selected[]",
options_for_select((a)roles.map {|r| [ r.name, "#{permission.id},#{r.id}" ]
}, :selected => "#{permission.id},#{permission.role.id}", :disabled =>
@permission_object.permissions.where(["user_id = ? and role_id != ?",
permission.user_id, permission.role_id]).collect {|p|
"#{permission.id},#{p.role.id}"}), :id =>
"permission_role_selected_#{permission.id}"
:javascript
Missing partial layouts/admin_users_tabs
can you please add this file and resend.
--
---
Tomáš Hrčka