More efficient My Groups. Close #124.

concerto · Jul 13, 2012 · bfff126 · bfff126
1 parent ff0869e
commit bfff126
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
@@ -2,8 +2,8 @@ class GroupsController < ApplicationController
   # GET /groups
   # GET /groups.xml
   def index
+    @groups = Group.all
     @my_groups = current_user.nil? ? [] : current_user.groups
-    @groups = Group.all - @my_groups
     auth!
 
     respond_to do |format|

diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
@@ -28,12 +28,13 @@
 					<% end %>
 				</ul>
 <% end %>
-<% if !@groups.empty? %>
+<% other_groups = @groups - @my_groups %>
+<% if !other_groups.empty? %>
 				<div class="subnav clearfix">
 		      <h4>Other Groups</h4>
 		    </div>
 				<ul class="list-stacked">
-					<% @groups.each do |group| %>
+					<% other_groups.each do |group| %>
 						<li>
 							<h3>
 								<%= link_to group, :class => "link-hl" do %>

diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb
@@ -19,6 +19,6 @@ def setup
     get :index
     assert assigns(:my_groups)
     assert_equal assigns(:my_groups).count, 2
-    assert_equal assigns(:groups).count, 0
+    assert_equal assigns(:groups).count, 2
   end
 end