@@ -16,7 +16,6 @@ class PeopleController < ApplicationController
def show
@person = Person.find(params[:id])
- @memberships = Membership.find(:all, :conditions => ["person_id = ?", @person.id])
@person_tips = Tip.find(:all, :limit => 3, :order => "id desc", :conditions => "person_id = " + @person.id.to_s + " and is_anon = false")
@number_of_tips = Tip.count(:conditions => "person_id = " + @person.id.to_s + " and is_anon = false")
@@ -25,7 +24,6 @@ class PeopleController < ApplicationController
def show_by_login
@person = Person.find_by_login(params[:login])
unless @person.nil?
- @memberships = Membership.find(:all, :conditions => ["person_id = ?", @person.id])
@person_tips = Tip.find(:all, :limit => 3, :order => "id desc", :conditions => "person_id = " + @person.id.to_s + " and is_anon = false")
@number_of_tips = Tip.count(:conditions => "person_id = " + @person.id.to_s + " and is_anon = false")
app/controllers/people_controller.rb
@@ -16,9 +16,6 @@ class TeamsController < ApplicationController
end
def show
- @memberships = @team.memberships
- @invitations = Invitation.find(:all, :conditions => [ "team_id = ? and accepted = 0" , @team.id ])
- @lists = List.find(:all, :conditions => [ "team_id = ?", @team.id ], :order => "name ASC")
end
def new
app/controllers/teams_controller.rb
@@ -3,4 +3,6 @@ class Invitation < ActiveRecord::Base
belongs_to(:person) # people can invite other people ...
belongs_to(:team) # ... into teams
+ named_scope :unaccepted, :conditions => {:accepted => false}
+
end
app/models/invitation.rb
@@ -51,16 +51,12 @@
<tr>
<th>Teams:</th>
<td>
- <table>
- <% for membership in @memberships %>
- <tr>
- <td><%= link_to_team(membership.team, 'picturelink') %></td>
- <td>
- <%= membership.confirmed? ? ' ' : ' (awaiting confirmation)' %>
- </td>
- </tr>
- <% end %>
- </table>
+ <% @person.memberships.each do |membership| -%>
+ <p>
+ <%= link_to_team(membership.team, 'picturelink') %>
+ <%= ' (awaiting confirmation)' unless membership.confirmed? %>
+ </p>
+ <% end -%>
</td>
</tr>
app/views/people/show.rhtml
@@ -41,7 +41,7 @@
<tr>
<th>Team Members:</th>
<td>
- <% @memberships.each do |membership| -%>
+ <% @team.memberships.each do |membership| -%>
<p>
<%= link_to_person(membership.person, 'picturelink') %>
<%= ' (awaiting confirmation)' unless membership.confirmed? %>
@@ -52,11 +52,12 @@
<% if controller.logged_in? && @team.member?(session[:person]) -%>
- <% if @invitations.any? -%>
+ <% invitations = @team.invitations.unaccepted -%>
+ <% if invitations.any? -%>
<tr>
<th>Invitations:</th>
<td>
- <% @invitations.each do |invitation| -%>
+ <% invitations.each do |invitation| -%>
<p>
<%= invitation.email %>
<%= link_to(image_tag('envelope.jpg', :size => '17x11', :alt => 'Send a reminder email?', :title => 'Send a reminder email?'), { :controller => 'invitations', :action => 'remind', :id => invitation.code }, :confirm => 'Would you like to send this person a reminder email?') %>
@@ -69,29 +70,18 @@
<tr>
<th>Lists:</th>
<td>
- <table>
- <tr><td colspan='2'><%= link_to('Create new list ...', {:controller=>'lists', :action=>'new', :team=>@team.id}, 'class'=>'picturelink list_add') %></td></tr>
-
-
- <% if @lists.empty? %>
- <tr><td colspan='2'>This team currently has no lists.</td></tr
- <% else %>
+ <p><%= link_to('Create new list ...', {:controller=>'lists', :action=>'new', :team=>@team.id}, 'class'=>'picturelink list_add') %></p>
- <tr>
- <% row_counter = 0 %>
+ <% lists = @team.lists -%>
- <% for list in @lists %>
- <td><%= link_to_list(list, 'picturelink') %> </td>
- <% row_counter += 1 %>
- <% if row_counter == 2 %>
- </tr><tr>
- <% row_counter = 0 %>
- <% end %>
- <% end %>
- </tr>
- <% end %>
-
- </table>
+ <% if lists.empty? %>
+ <p>This team currently has no lists.</p>
+ <% else %>
+ <% lists.each do |list| -%>
+ <p><%= link_to_list(list, 'picturelink') %></p>
+ <% end -%>
+ <% end -%>
+
</td>
</tr>
app/views/teams/show.rhtml
70a6a390ef5dabfdacf940095cd46073b4f526cf
Aimee Daniells
aimee@edendevelopment.co.uk
http://github.com/sermoa/mychores/commit/cd57ddc9da0e72ed69793bc64a5670860d1b4fd4
cd57ddc9da0e72ed69793bc64a5670860d1b4fd4
2009-04-18T15:27:54-07:00
2009-04-18T15:27:54-07:00
Refactored the fetching and displaying of members and lists.
0c60d71ca2a22693594def01f502b5a327804701
Aimee Daniells
aimee@edendevelopment.co.uk