diff options
Diffstat (limited to 'app/views/user_groups')
| -rw-r--r-- | app/views/user_groups/_index_core.html.haml | 49 | ||||
| -rw-r--r-- | app/views/user_groups/show.html.haml | 28 |
2 files changed, 45 insertions, 32 deletions
diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml index 941f9fa..a85e8c4 100644 --- a/app/views/user_groups/_index_core.html.haml +++ b/app/views/user_groups/_index_core.html.haml @@ -1,28 +1,33 @@ - cache(['user_groups_table', I18n.locale, current_user, @user, user_groups, User.order(:updated_at).last, User.count, UserGroupMembership.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do - %table{:class => 'table table-striped'} - %tr - %th= t('user_groups.index.name') - - if user_groups.pluck(:description).uniq != [nil] - %th= t('user_groups.index.description') - - if @user - %th= t('user_groups.index.tenant_id') - - else - %th= t('user_groups.index.members') - %th{:colspan => '3'} - - - for user_group in user_groups + %table.table.table-striped + %thead %tr - %td= user_group.name + %th= t('user_groups.index.name') - if user_groups.pluck(:description).uniq != [nil] - %td= user_group.description + %th + %span.hidden-phone + = t('user_groups.index.description') - if @user - %td= user_group.tenant + %th + %span.hidden-phone + = t('user_groups.index.tenant_id') - else - %td - =render 'users/listing', :users => user_group.users - - if user_group.users.any? - %br - - if (user_group.tenant.user_ids - user_group.user_ids).any? - = render :partial => 'shared/create_link', :locals => {:parent => user_group, :child_class => UserGroupMembership} + %th= t('user_groups.index.members') - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group} + %tbody + - for user_group in user_groups + %tr + %td= user_group.name + - if user_groups.pluck(:description).uniq != [nil] + %td + %span.hidden-phone + = user_group.description + - if @user + %td + %span.hidden-phone + = user_group.tenant + - else + %td + =render 'users/listing', :users => user_group.users + + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group} diff --git a/app/views/user_groups/show.html.haml b/app/views/user_groups/show.html.haml index fe5b745..fd5414e 100644 --- a/app/views/user_groups/show.html.haml +++ b/app/views/user_groups/show.html.haml @@ -1,20 +1,28 @@ - content_for :title, t("user_groups.show.page_title") -%p - %strong= t('user_groups.show.name') + ":" - = @user_group.name -%p - %strong= t('user_groups.show.description') + ":" - = @user_group.description -%p - %strong= t('user_groups.show.tenant_id') + ":" - = @user_group.tenant +%table.table.table-striped + %tbody + %tr + %td + %strong= t('user_groups.show.name') + ":" + %td + = @user_group.name + %tr + %td + %strong= t('user_groups.show.description') + ":" + %td + = @user_group.description + %tr + %td + %strong= t('user_groups.show.tenant_id') + ":" + %td + = @user_group.tenant = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @user_group.tenant, :child => @user_group } %h2=t("user_group_memberships.index.page_title") -- if @user_group.user_group_memberships.count > 0 +- if @user_group.user_group_memberships.any? = render "user_group_memberships/index_core", :user_group_memberships => @user_group.user_group_memberships = render :partial => 'shared/create_link', :locals => {:parent => @user_group, :child_class => UserGroupMembership}
\ No newline at end of file |