Merge remote-tracking branch 'origin/develop' into develop

1 files changed, 9 insertions, 1 deletions

diff --git a/app/views/groups/_index_core.html.haml b/app/views/groups/_index_core.html.haml
index 3a444bf..e67eb66 100644
--- a/app/views/groups/_index_core.html.haml
+++ b/app/views/groups/_index_core.html.haml
@@ -2,6 +2,8 @@
   %tr
     %th
     %th= t('groups.index.name')
+    %th= t('groups.index.permissions')
+    %th= t('groups.index.memberships')
     %th= t('groups.index.comment')
 
   
@@ -13,5 +15,11 @@
         - else
           %i.icon-ban-circle
       %td= group.name
+      %td
+        - if group.group_permissions.count > 0 && group.group_permissions.count < 4
+          = group.group_permissions.pluck(:permission).uniq.join(' ')
+        - else
+          = group.group_permissions.count
+      %td= group.group_memberships.count
       %td= group.comment
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => group}
\ No newline at end of file
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => group}