From 7472642bd1d56b9a01ae6ee379536406701ae19e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Rodr=C3=ADguez?= <fabianrbz@gmail.com>
Date: Wed, 6 Feb 2013 19:14:48 -0200
Subject: [PATCH] Refactor:   *people_controller#show  
 *photos_controller#index   *views/people/show both html and mobile

---
 app/controllers/people_controller.rb |  9 ---------
 app/controllers/photos_controller.rb |  8 +-------
 app/views/people/show.html.haml      |  6 +++---
 app/views/people/show.mobile.haml    | 11 +----------
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index a7ea9541d..c54f8ef17 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -82,27 +82,18 @@ class PeopleController < ApplicationController
 
     @post_type = :all
     @aspect = :profile
-    @share_with = (params[:share_with] == 'true')
-
     @stream = Stream::Person.new(current_user, @person, :max_time => max_time)
-
     @profile = @person.profile
 
     unless params[:format] == "json" # hovercard
       if current_user
         @block = current_user.blocks.where(:person_id => @person.id).first
         @contact = current_user.contact_for(@person)
-        @aspects_with_person = []
         if @contact && !params[:only_posts]
-          @aspects_with_person = @contact.aspects
-          @aspect_ids = @aspects_with_person.map(&:id)
           @contacts_of_contact_count = @contact.contacts.count
           @contacts_of_contact = @contact.contacts.limit(8)
-
         else
           @contact ||= Contact.new
-          @contacts_of_contact_count = 0
-          @contacts_of_contact = []
         end
       end
     end
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 319bb5187..186b96435 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -12,23 +12,17 @@ class PhotosController < ApplicationController
     @person = Person.find_by_guid(params[:person_id])
 
     if @person
-      @profile = @person.profile
       @contact = current_user.contact_for(@person)
-      @is_contact = @person != current_user.person && @contact
-      @aspects_with_person = []
 
       if @contact
-        @aspects_with_person = @contact.aspects
         @contacts_of_contact = @contact.contacts
         @contacts_of_contact_count = @contact.contacts.count
       else
         @contact = Contact.new
-        @contacts_of_contact = []
-        @contacts_of_contact_count = 0
       end
 
       @posts = current_user.photos_from(@person)
-      
+
       respond_to do |format|
         format.all { render 'people/show' }
         format.json{ render_for_api :backbone, :json => @posts, :root => :photos }
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index a2b18ca21..bd305550b 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -15,14 +15,14 @@
 .span-6
   = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact }
 
-  - if user_signed_in? && @contact.persisted? && @contacts_of_contact.count > 0
+  - if user_signed_in? && @contact.persisted? && @contacts_of_contact_count > 0
     .span-5.last#contacts_of_contact
       .section.contact_pictures
         %h4
           = t('contacts', :count => @contacts_of_contact_count)
-        - for person in @contacts_of_contact
+        - @contacts_of_contact.each do |person|
           = person_image_link person
-      - if @contacts_of_contact.count > 8
+      - if @contacts_of_contact_count > 8
         %p.see_all= link_to t('.see_all'), person_contacts_path(@person)
 
 .span-18.last
diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml
index 28cf9a18b..f6d7254ba 100644
--- a/app/views/people/show.mobile.haml
+++ b/app/views/people/show.mobile.haml
@@ -15,18 +15,9 @@
       %span.description
         = @person.diaspora_handle
 
-  - if user_signed_in? && !(@contact.persisted? || current_user.person == @person)
-    - if @incoming_request
-      .floating
-        %h3
-          = t('.incoming_request', :name => @person.name)
-        %h4
-          = link_to t('.return_to_aspects'), aspects_manage_path
-          = t('.to_accept_or_ignore')
-
 .span12
   - if @stream.stream_posts.length > 0
-    -if @post_type == :photos
+    - if @post_type == :photos
       = render 'photos/index', :photos => @stream.stream_posts
     - else
       #main_stream.stream