From d56828fa4def2fbc496a31f726d0b58538a6c2bb Mon Sep 17 00:00:00 2001 From: wvengen Date: Fri, 4 Mar 2016 16:28:18 +0100 Subject: [PATCH] Show last user activity in admin ordergroups too --- app/helpers/admin/ordergroups_helper.rb | 10 ++++++++++ app/views/admin/ordergroups/_ordergroups.html.haml | 9 +++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 app/helpers/admin/ordergroups_helper.rb diff --git a/app/helpers/admin/ordergroups_helper.rb b/app/helpers/admin/ordergroups_helper.rb new file mode 100644 index 00000000..e74fdde5 --- /dev/null +++ b/app/helpers/admin/ordergroups_helper.rb @@ -0,0 +1,10 @@ +module Admin::OrdergroupsHelper + def ordergroup_members_title(ordergroup) + s = '' + s += ordergroup.users.map(&:name).join(', ') if ordergroup.users.any? + if ordergroup.contact_person.present? + s += "\n" + Ordergroup.human_attribute_name(:contact) + ": " + ordergroup.contact_person + end + s + end +end diff --git a/app/views/admin/ordergroups/_ordergroups.html.haml b/app/views/admin/ordergroups/_ordergroups.html.haml index 9de721b0..ade997d6 100644 --- a/app/views/admin/ordergroups/_ordergroups.html.haml +++ b/app/views/admin/ordergroups/_ordergroups.html.haml @@ -5,17 +5,18 @@ %thead %tr %th= heading_helper Ordergroup, :name - %th= heading_helper Ordergroup, :contact - %th= heading_helper Ordergroup, :contact_address %th= heading_helper Ordergroup, :user_tokens + %th= heading_helper Ordergroup, :contact_address + %th= heading_helper Ordergroup, :last_user_activity %th= t 'ui.actions' %tbody - for ordergroup in @ordergroups %tr{:class => cycle('even','odd', :name => 'groups')} %td= link_to ordergroup.name, [:admin, ordergroup] - %td= ordergroup.contact + %td{title: ordergroup_members_title(ordergroup)} + %abbr{title: ordergroup_members_title(ordergroup)}= ordergroup.users.size %td= link_to_gmaps ordergroup.contact_address - %td= ordergroup.users.size + %td= format_date ordergroup.last_user_activity %td = link_to t('ui.edit'), edit_admin_ordergroup_path(ordergroup), class: 'btn btn-mini' = link_to t('ui.delete'), [:admin, ordergroup], :data => {:confirm => t('admin.confirm', name: ordergroup.name)},