Merge pull request #4002 from marpo60/refactor_people_show

Refactor people show

Changelog.md

@@ -1,5 +1,9 @@
 # Head
 
+## Refactor
+
+* Refactor people_controller#show and photos_controller#index [#4002](https://github.com/diaspora/diaspora/issues/4002)
+
 ## Features
 
 * Deleting a post that was shared to Facebook now deletes it from Facebook too [#3980]( https://github.com/diaspora/diaspora/pull/3980)

app/assets/stylesheets/application.css.sass

@@ -988,6 +988,7 @@ ul#settings_nav
 
 .dull
   :color #aaa
+  :text-align center
   :font
     :style italic
 

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
@@ -155,8 +146,6 @@ class PeopleController < ApplicationController
       @aspect = :profile
       @contacts_of_contact = @contact.contacts.paginate(:page => params[:page], :per_page => (params[:limit] || 15))
       @hashes = hashes_for_people @contacts_of_contact, @aspects
-      @aspects_with_person = @contact.aspects
-      @aspect_ids = @aspects_with_person.map(&:id)
     else
       flash[:error] = I18n.t 'people.show.does_not_exist'
       redirect_to people_path

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 }

app/views/people/contacts.haml

@@ -16,6 +16,6 @@
   = render 'people/sub_header', :person => @person, :contact => @contact
 
   #people_stream.stream
-    - for hash in @hashes
+    - @hashes.each do |hash|
       = render :partial => 'people/person', :locals => hash
   = will_paginate @contacts_of_contact

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
@@ -31,8 +31,8 @@
 
     #main_stream.stream
       - if @block.present?
-        %div{:style=>"text-align:center;", :class => "dull"}
+        .dull
           = t('.ignoring', :name => @person.first_name)
-          
+
     #paginate
       %span.loader.hidden

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
@@ -35,10 +26,9 @@
           %a.more-link.paginate{:href => next_page_path}
             %h1
               = t("more")
-
   - else
     #main_stream
-      %div{:style=>"text-align:center;", :class => "dull"}
+      .dull
       - if user_signed_in? && (current_user.person != @person)
         = t('.has_not_shared_with_you_yet', :name => @person.first_name)