From 4096a035b2acea97c9c61f8ba3e494f71cd9d736 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 6 Nov 2015 18:23:29 -0300 Subject: [PATCH] Display badges separated by the owner --- controllers/admin/gamification_plugin_badges_controller.rb | 2 +- views/gamification_plugin_badges/index.html.erb | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/controllers/admin/gamification_plugin_badges_controller.rb b/controllers/admin/gamification_plugin_badges_controller.rb index 18803e0..2ccd61d 100644 --- a/controllers/admin/gamification_plugin_badges_controller.rb +++ b/controllers/admin/gamification_plugin_badges_controller.rb @@ -1,7 +1,7 @@ class GamificationPluginBadgesController < PluginAdminController def index - @gamification_plugin_badges = environment.gamification_plugin_badges + @gamification_plugin_badges = environment.gamification_plugin_badges.group_by(&:owner) end def show diff --git a/views/gamification_plugin_badges/index.html.erb b/views/gamification_plugin_badges/index.html.erb index 08e1913..952fd3e 100644 --- a/views/gamification_plugin_badges/index.html.erb +++ b/views/gamification_plugin_badges/index.html.erb @@ -10,7 +10,11 @@ -<% @gamification_plugin_badges.each do |gamification_plugin_badge| %> +<% @gamification_plugin_badges.each do |owner, badges| %> + <% if owner.present? %> + <%= _("Badges for:") %> <%= owner.name %> + <% end %> + <% badges.each do |gamification_plugin_badge| %> <%= gamification_plugin_badge.name %> <%= gamification_plugin_badge.title %> @@ -19,6 +23,7 @@ <%= link_to 'Edit', :action => :edit, :id => gamification_plugin_badge.id %> <%= button_without_text :delete, _('Remove'), {:action => :destroy, :id => gamification_plugin_badge.id}, :method => :post, :confirm => _('Are you sure?') %> + <% end %> <% end %> -- libgit2 0.21.2