[PATCH conductor 5/5] Fixed a couple minor UI nits from the prior user groups UI

Scott Seago sseago at redhat.com
Fri Jul 27 19:59:18 UTC 2012


---
 src/app/views/permissions/_form.html.haml        |    2 +-
 src/app/views/permissions/_permissions.html.haml |    2 +-
 src/app/views/user_groups/edit.html.haml         |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/views/permissions/_form.html.haml b/src/app/views/permissions/_form.html.haml
index 39b1865..6b1c04f 100644
--- a/src/app/views/permissions/_form.html.haml
+++ b/src/app/views/permissions/_form.html.haml
@@ -31,5 +31,5 @@
     %td
       -# - selected = params[:select] == 'all'
       -#  = check_box_tag "entity_selected[]", entity.id, selected, :id => "entity_checkbox_#{entity.id}"
-    %td= link_to entity.name, (entity.user ? user_path(entity.user) : user_group_path(entity.user_group))
+    %td= link_to entity.name, ((entity.entity_target_type == "User") ? user_path(entity.user) : user_group_path(entity.user_group))
     %td= select_tag "entity_role_selected[]", options_for_select([['', "#{entity.id},"]] + @roles.map {|r| [t(r.name, :scope=> :role_defs, :default => r.name), "#{entity.id},#{r.id}" ] }, :disabled => @permission_object.permissions.where(:entity_id=>entity.id).collect {|p| "#{entity.id},#{p.role.id}"}), :id => "entity_role_selected_#{entity.id}"
diff --git a/src/app/views/permissions/_permissions.html.haml b/src/app/views/permissions/_permissions.html.haml
index 56a0c8e..4f2818d 100644
--- a/src/app/views/permissions/_permissions.html.haml
+++ b/src/app/views/permissions/_permissions.html.haml
@@ -54,7 +54,7 @@
         - 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.entity.name, (permission.entity.user ? user_path(permission.entity.user) : user_group_path(permission.entity.user_group))
+    %td= link_to permission.entity.name, ((permission.entity.entity_target_type == "User") ? user_path(permission.entity.user) : user_group_path(permission.entity.user_group))
     - if not(@show_inherited or @show_global) && check_privilege(Privilege::PERM_SET)
       %td= select_tag "permission_role_selected[]", options_for_select(@roles.map {|r| [ t(r.name, :scope=> :role_defs, :default => r.name), "#{permission.id},#{r.id}" ] }, :selected => "#{permission.id},#{permission.role.id}", :disabled => @permission_object.permissions.where(["entity_id = ? and role_id != ?", permission.entity_id, permission.role_id]).collect {|p| "#{permission.id},#{p.role.id}"}), :id => "permission_role_selected_#{permission.id}"
       :javascript
diff --git a/src/app/views/user_groups/edit.html.haml b/src/app/views/user_groups/edit.html.haml
index 7350a43..62d4be9 100644
--- a/src/app/views/user_groups/edit.html.haml
+++ b/src/app/views/user_groups/edit.html.haml
@@ -4,11 +4,11 @@
     .return_to
       =t'return_to'
       = link_to "#{t'user_groups.groups'}", user_groups_path
-  %h1.users= @title
+  %h1.user_groups= @title
 
 %section.content-section.user_groups
   .content
     .align-center
-    = @user_group.name
+    %h2.user_groups= @user_group.name
     = form_for @user_group, :url => user_group_path(@user_group), :html => {:class => 'generic horizontal'} do |f|
       = render :partial => "form", :locals => { :form => f }
-- 
1.7.6.5




More information about the aeolus-devel mailing list