Merge branch 'master' into multiple-classrooms-stafftools-fix

education · Oct 30, 2018 · b9e9298 · b9e9298
2 parents 655d82c + 4f913bd
commit b9e9298
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/group_assignment_invitations_controller.rb b/app/controllers/group_assignment_invitations_controller.rb
@@ -17,7 +17,7 @@ class InvalidStatusForRouteError < StandardError; end
   before_action :ensure_group_import_resiliency_enabled, only: %i[create_repo progress]
 
   def show
-    @groups = invitation.groups.map { |group| [group.title, group.id] }
+    @groups = invitation.groups.order(:title).page(params[:page])
   end
 
   def accept; end

diff --git a/app/views/group_assignment_invitations/_group_assignment_team.erb b/app/views/group_assignment_invitations/_group_assignment_team.erb
@@ -1,6 +1,5 @@
   <div class="team-panel">
     <div class="boxed-group">
-      <% group = group_assignment_repo.group %>
       <%= form_tag({ controller: :group_assignment_invitations, action: :accept_invitation}, :class => "team-actions-form", method: :patch) do %>
           <%= hidden_field_tag 'group[id]', group.id %>
           <% if group_assignment.max_members.present? && group.repo_accesses.count >= group_assignment.max_members %>

diff --git a/app/views/group_assignment_invitations/show.html.erb b/app/views/group_assignment_invitations/show.html.erb
@@ -26,24 +26,25 @@
     <div class="team-grid">
       <div class="columns">
         <div class="one-half team-left">
-          <% @group_assignment.group_assignment_repos.each do |group_assignment_repo| %>
+          <% @groups.each do |group| %>
               <% if cycle('odd', 'even') == 'odd' %>
-                <%= render partial: 'group_assignment_team', locals: { group_assignment_repo: group_assignment_repo } %>
+                <%= render partial: 'group_assignment_team', locals: { group: group } %>
               <% end %>
           <% end %>
         </div>
         <% reset_cycle %>
         <div class="one-half team-right">
-          <% @group_assignment.group_assignment_repos.each do |group_assignment_repo| %>
+          <% @groups.each do |group| %>
               <% if cycle('odd', 'even') == 'even' %>
-                <%= render partial: 'group_assignment_team', locals: { group_assignment_repo: group_assignment_repo } %>
+                <%= render partial: 'group_assignment_team', locals: { group: group } %>
               <% end %>
           <% end %>
         </div>
       </div>
 
       <div style="clear:both"></div>
     </div>
+  <%= render partial: 'shared/pagination', locals: { collection: @groups } %>
   <% end %>
 
   <hr>