Refactor ProgrammingGroups view controller

Author: MrSerth

app/controllers/programming_groups_controller.rb

@@ -10,7 +10,12 @@ class ProgrammingGroupsController < ApplicationController
   def index
     set_exercise_and_authorize if params[:exercise_id].present?
     @search = policy_scope(ProgrammingGroup).ransack(params[:q], {auth_object: current_user})
-    @programming_groups = @search.result.includes(:exercise, :programming_group_memberships, :internal_users, :external_users).order(:id).paginate(page: params[:page], per_page: per_page_param)
+    if params[:exercise_id].present?
+      @programming_groups = @search.result.where(exercise: @exercise)
+    else
+      @programming_groups = @search.result
+    end
+    @programming_groups = @programming_groups.includes(:exercise, :programming_group_memberships, :internal_users, :external_users).order(:id).paginate(page: params[:page], per_page: per_page_param)
     authorize!
   end
 

app/views/programming_groups/index.html.slim

@@ -1,4 +1,4 @@
-- if params[:exercise_id].nil?
+- if @exercise.nil?
   h1 = ProgrammingGroup.model_name.human(count: :other)
   = render(layout: 'shared/form_filters') do |f|
     .col-auto
@@ -12,33 +12,29 @@
       = f.label(:programming_group_memberships_user_of_InternalUser_type_id_eq, ProgrammingGroup.human_attribute_name('internal_user_id'), class: 'visually-hidden form-label')
       = f.search_field(:programming_group_memberships_user_of_InternalUser_type_id_eq, class: 'form-control', placeholder: ProgrammingGroup.human_attribute_name('internal_user_id'))
 - else
-  h1 = "#{ProgrammingGroup.model_name.human(count: :other)} for Exercise '#{@exercise.title}'"
+  h1 = t('.for', model: ProgrammingGroup.model_name.human(count: :other), exercise: @exercise.title)
 
 .table-responsive
   table.table.mt-4 class=(@programming_groups.present? ? 'sortable' : '')
     thead
       tr
         th.sortable_nosort = sort_link(@search, :id, ProgrammingGroup.human_attribute_name('name'))
-        - if params[:exercise_id].blank?
+        - if @exercise.nil?
           th.sorttable_nosort = sort_link(@search, :exercise_id, ProgrammingGroup.human_attribute_name('exercise'))
         th = ProgrammingGroup.human_attribute_name('member')
         th = ProgrammingGroup.human_attribute_name('member_count')
         th.sorttable_nosort = sort_link(@search, :created_at, t('shared.created_at'))
         th colspan=3 = t('shared.actions')
     tbody
-      - if params[:exercise_id].nil?
-        - filtered_programming_groups = @programming_groups
-      - else
-        - filtered_programming_groups = @programming_groups.where(exercise_id: params[:exercise_id])
-      - filtered_programming_groups.each do |programming_group|
+      - @programming_groups.each do |programming_group|
         tr
           td = link_to_if(policy(programming_group).show?, programming_group.displayname, programming_group)
-          - if params[:exercise_id].blank?
+          - if @exercise.nil?
             td = link_to_if(policy(programming_group.exercise).show?, programming_group.exercise.title, programming_group.exercise, 'data-turbolinks': 'false')
           td == programming_group.users.map {|user| link_to_if(policy(user).show?, user.name, user) }.join(', ')
           td = programming_group.users.size
           td = l(programming_group.created_at, format: :short)
-          td = link_to(t('shared.show'), programming_group) if policy(programming_group).show?
-          td = link_to(t('shared.edit'), edit_programming_group_path(programming_group)) if policy(programming_group).edit?
-          td = link_to(t('shared.destroy'), programming_group, data: {confirm: t('shared.confirm_destroy')}, method: :delete) if policy(programming_group).destroy?
+          td = link_to(t('shared.show'), [@exercise, programming_group]) if policy(programming_group).show?
+          td = link_to(t('shared.edit'), polymorphic_path([@exercise, programming_group], action: :edit)) if policy(programming_group).edit?
+          td = link_to(t('shared.destroy'), [@exercise, programming_group], data: {confirm: t('shared.confirm_destroy')}, method: :delete) if policy(programming_group).destroy?
 = render('shared/pagination', collection: @programming_groups)

config/locales/de/programming_group.yml

@@ -20,6 +20,8 @@ de:
         programming_partner_ids: 'Sie können mehrere Personen-IDs mit Kommata getrennt eingeben, wie z.B.: ''e123, e234''.'
     implement:
       info_disconnected: Ihre Verbindung zum Server wurde unterbrochen. Bitte überprüfen Sie Ihre Internetverbindung und laden Sie die Seite erneut.
+    index:
+      for: "%{model} für Aufgabe '%{exercise}'"
     new:
       create_programming_pair: Programmierpaar erstellen
       dont_show_modal_again: Auf diesem Gerät nicht mehr anzeigen

config/locales/en/programming_group.yml

@@ -20,6 +20,8 @@ en:
         programming_partner_ids: You can enter several user IDs separated by commas such as 'e123, e234'.
     implement:
       info_disconnected: You are disconnected from the server. Please check your internet connection and reload the page.
+    index:
+      for: "%{model} for Exercise '%{exercise}'"
     new:
       create_programming_pair: Create Programming Pair
       dont_show_modal_again: Don't display on this device anymore