Merge branch 'develop'5.1-beta1

5 files changed, 29 insertions, 25 deletions

diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml
index d2b6e88..941f9fa 100644
--- a/app/views/user_groups/_index_core.html.haml
+++ b/app/views/user_groups/_index_core.html.haml
@@ -1,24 +1,28 @@
-%table
-  %tr
-    %th= t('user_groups.index.name')
-    %th= t('user_groups.index.description')
-    - if @user
-      %th= t('user_groups.index.tenant_id')
-    - else
-      %th= t('user_groups.index.members')
-
-  - reset_cycle
-  - for user_group in user_groups
-    %tr{:class => cycle('odd', 'even')}
-      %td= user_group.name
-      %td= user_group.description
+- 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
-        %td= user_group.tenant
+        %th= t('user_groups.index.tenant_id')
       - else
-        %td
-          =render 'users/listing', :users => user_group.users
-          - if user_group.users.count > 1
-            %br
-          = render :partial => 'shared/create_link', :locals => {:parent => user_group, :child_class => UserGroupMembership}
+        %th= t('user_groups.index.members')
+      %th{:colspan => '3'}
+    
+    - for user_group in user_groups
+      %tr
+        %td= user_group.name
+        - if user_groups.pluck(:description).uniq != [nil]
+          %td= user_group.description
+        - if @user
+          %td= user_group.tenant
+        - 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}
 
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group}
+        =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group}
diff --git a/app/views/user_groups/edit.html.haml b/app/views/user_groups/edit.html.haml
index 35514e0..4d263a4 100644
--- a/app/views/user_groups/edit.html.haml
+++ b/app/views/user_groups/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("user_groups.edit.page_title", :resource => @user_group)
+- content_for :title, t("user_groups.edit.page_title", :resource => @user_group)
 
 = render "form"
diff --git a/app/views/user_groups/index.html.haml b/app/views/user_groups/index.html.haml
index 545b838..7240f5f 100644
--- a/app/views/user_groups/index.html.haml
+++ b/app/views/user_groups/index.html.haml
@@ -1,4 +1,4 @@
-- title t("user_groups.index.page_title")
+- content_for :title, t("user_groups.index.page_title")
 
 - if @user_groups.count > 0
   = render "index_core", :user_groups => @user_groups
diff --git a/app/views/user_groups/new.html.haml b/app/views/user_groups/new.html.haml
index dfef18e..3c5920f 100644
--- a/app/views/user_groups/new.html.haml
+++ b/app/views/user_groups/new.html.haml
@@ -1,3 +1,3 @@
-- title t("user_groups.new.page_title")
+- content_for :title, t("user_groups.new.page_title")
 
 = render "form"
diff --git a/app/views/user_groups/show.html.haml b/app/views/user_groups/show.html.haml
index 00bdeb7..fe5b745 100644
--- a/app/views/user_groups/show.html.haml
+++ b/app/views/user_groups/show.html.haml
@@ -1,4 +1,4 @@
-- title t("user_groups.show.page_title")
+- content_for :title, t("user_groups.show.page_title")
 
 %p
   %strong= t('user_groups.show.name') + ":"