join link checks to see if user is a member. #64

concerto · Apr 1, 2012 · c4dd6b0 · c4dd6b0
1 parent d87d9c7
commit c4dd6b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/group.rb b/app/models/group.rb
@@ -1,7 +1,7 @@
 class Group < ActiveRecord::Base
   has_many :feeds
   has_many :memberships, :dependent => :destroy
-  has_many :users, :through => :memberships, :conditions => ["memberships.level != ?", Membership::LEVELS[:pending]]
+  has_many :users, :through => :memberships, :conditions => ["memberships.level > ?", Membership::LEVELS[:pending]]
   has_many :screens, :as => :owner
 
   #Scoped relations for leaders

diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
@@ -14,7 +14,7 @@
 			<% @groups.each do |group| %>
 			  <tr>
 			    <td><%= group.name %></td>
-			    <td><%= link_to 'Show', group %> <%= link_to 'Edit', edit_group_path(group) %> <%= link_to 'Destroy', group, :confirm => 'Are you sure?', :method => :delete %><%= link_to("Join", group_memberships_path(:group_id => group.id, :membership => {:user_id => current_user.id}), :method => :post) if user_signed_in? %></td>
+			    <td><%= link_to 'Show', group %> <%= link_to 'Edit', edit_group_path(group) %> <%= link_to 'Destroy', group, :confirm => 'Are you sure?', :method => :delete %><%= link_to("Join", group_memberships_path(:group_id => group.id, :membership => {:user_id => current_user.id}), :method => :post) if user_signed_in? & !group.has_member?(current_user) %></td>
 			  </tr>
 			<% end %>
 			</table>