Merge pull request #3714 from marpo60/refactor

Housekeeping

app/controllers/people_controller.rb

@@ -66,20 +66,6 @@ def tag_index
     respond_with @people
   end
 
-  def hashes_for_people(people, aspects)
-    ids = people.map{|p| p.id}
-    contacts = {}
-    Contact.unscoped.where(:user_id => current_user.id, :person_id => ids).each do |contact|
-      contacts[contact.person_id] = contact
-    end
-
-    people.map{|p|
-      {:person => p,
-        :contact => contacts[p.id],
-        :aspects => aspects}
-    }
-  end
-
   def show
     @person = Person.find_from_guid_or_username(params)
 
@@ -162,6 +148,8 @@ def aspect_membership_dropdown
     end
   end
 
+  private
+
   def redirect_if_tag_search
     if search_query.starts_with?('#')
       if search_query.length > 1
@@ -173,7 +161,19 @@ def redirect_if_tag_search
     end
   end
 
-  private
+  def hashes_for_people(people, aspects)
+    ids = people.map{|p| p.id}
+    contacts = {}
+    Contact.unscoped.where(:user_id => current_user.id, :person_id => ids).each do |contact|
+      contacts[contact.person_id] = contact
+    end
+
+    people.map{|p|
+      {:person => p,
+        :contact => contacts[p.id],
+        :aspects => aspects}
+    }
+  end
 
   def search_query
     @search_query ||= params[:q] || params[:term] || ''

app/helpers/layout_helper.rb

@@ -65,7 +65,7 @@ def translation_missing_warnings
   end
 
   def include_base_css_framework(use_bootstrap=false)
-    if use_bootstrap || @aspect == :getting_started || @page == :experimental
+    if use_bootstrap || @aspect == :getting_started
       stylesheet_link_tag 'bootstrap-complete'
     else
       stylesheet_link_tag 'blueprint', :media => 'screen'

app/helpers/people_helper.rb

@@ -16,15 +16,6 @@ def search_header
     end
   end
 
-  def request_partial single_aspect_form
-    if single_aspect_form
-      'requests/new_request_with_aspect_to_person'
-
-    else
-      'requests/new_request_to_person'
-    end
-  end
-
   def search_or_index
     if search_query
       I18n.t 'people.helper.results_for',:params => search_query

app/models/user.rb

@@ -227,14 +227,6 @@ def self.find_for_database_authentication(conditions={})
     where(conditions).first
   end
 
-  # @param [Person] person
-  # @return [Boolean] whether this user can add person as a contact.
-  def can_add?(person)
-    return false if self.person == person
-    return false if self.contact_for(person).present?
-    true
-  end
-
   def confirm_email(token)
     return false if token.blank? || token != confirm_email_token
     self.email = unconfirmed_email