nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved the add people into a partial

Browse source
This commit is contained in:
ilya 2010-10-20 15:41:42 -07:00
parent 62700387ad
commit 6bee872039
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/aspects_controller.rb
View file

@ -46,7 +46,7 @@ class AspectsController < ApplicationController
def show def show
@aspect = current_user.aspect_by_id params[:id] @aspect = current_user.aspect_by_id params[:id]
@friends_dropdown_array = current_user.friends.all(:person_id.nin => @aspect.person_ids ) @friends_not_in_aspect = current_user.friends.all(:person_id.nin => @aspect.person_ids )
unless @aspect unless @aspect
render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404 render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
else else

7
app/views/requests/_new_request.haml
View file

@ -8,10 +8,9 @@
=t('.add_a_new_friend_to') =t('.add_a_new_friend_to')
%i= aspect.name %i= aspect.name
= form_tag '/aspects/add_to_aspect', :id => 'add_to_aspect' do - if @friends_not_in_aspect
= select_tag :friend_id, options_from_collection_for_select(@friends_dropdown_array, "id", "real_name"), :include_blank => true = render('shared/add_friend_dropdown', :aspect => @aspect, :friends => @friends_not_in_aspect)
= hidden_field_tag :aspect_id, aspect.id
= submit_tag "add to #{@aspect.name}"

5
app/views/shared/_add_friend_dropdown.html.haml Normal file
View file

@ -0,0 +1,5 @@
= form_tag '/aspects/add_to_aspect', :id => 'add_to_aspect' do
= select_tag :friend_id, options_from_collection_for_select(friends, "id", "real_name"), :include_blank => true
= hidden_field_tag :aspect_id, aspect.id
= submit_tag "add to #{aspect.name}"