Skip to content
Extraits de code Groupes Projets
Valider 756278f4 rédigé par maxwell's avatar maxwell
Parcourir les fichiers

MS added friend search, and allow for autodiscover

parent c98c52ad
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
class UsersController < ApplicationController
before_filter :authenticate_user!, :except => [:new, :create]
def index
puts "awesome"
@groups_array = current_user.groups.collect{|x| [x.to_s, x.id]}
puts params.inspect
unless params[:q]
@people = Person.all
render :index
......
......@@ -2,10 +2,10 @@ module PeopleHelper
def search_or_index
if params[:q]
" results for #{q}"
" results for #{params[:q]}"
else
" people on this pod"
end
end
end
\ No newline at end of file
end
......@@ -38,6 +38,7 @@
%li.name= link_to current_user.real_name, current_user.person
%li= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
%li= link_to "settings", edit_user_path(current_user)
%li= link_to "search", users_path
%li= link_to "logout", destroy_user_session_path
- else
= link_to "login", new_user_session_path
......
= (@people.count-1).to_s + search_or_index
%p
=form_tag '/users', :method => "get" do
= text_field_tag :q
= submit_tag "search"
= link_to "reset", users_path
= (@people.count).to_s + search_or_index
%table
%tr
%th real name
%th email
%th url
- for person in @people
- unless person.id == current_user.person.id
- for person in @people
%tr
%td= person.real_name
%td= person.email
%td= person.url
-if current_user.friends.include? person
- elsif person.id == current_user.person.id
%td
%td thats you!
-elsif current_user.pending_requests.find_by_person_id(person.id)
%td
%td ^-you have a friend request from this person
......@@ -19,6 +28,7 @@
%td
%td friend request pending
-else
%td
%td
= form_for Request.new do |f|
= f.select(:group_id, @groups_array)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter