github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 15:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

added aspect filtering to contact index. fixed rspec

Browse Source
This commit is contained in:
danielgrippi
2011-06-27 15:03:39 -07:00
parent 1fe4c3c3de
commit f839714646
5 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/contacts_controller.rb
View File

@@ -11,7 +11,9 @@ class ContactsController < ApplicationController
@all_contacts_count = current_user.contacts.count
@my_contacts_count = current_user.contacts.receiving.count
unless params[:set] == "all"
if params["a_id"]
@contacts = current_user.aspects.find(params["a_id"]).contacts.includes(:aspects, :person => :profile).order('profiles.last_name ASC').paginate(:page => params[:page], :per_page => 25)
elsif params[:set] != "all"
@contacts = current_user.contacts.receiving.includes(:aspects, :person => :profile).order('profiles.last_name ASC').paginate(:page => params[:page], :per_page => 25)
else
@contacts = current_user.contacts.includes(:aspects, :person => :profile).order('profiles.last_name ASC').paginate(:page => params[:page], :per_page => 25)