api: do not include uploads unless specified

Author: jrom

app/controllers/api_v1/activities_controller.rb

@@ -18,7 +18,7 @@ def show
     authorize!(:show, @activity) if @activity
 
     if @activity
-      api_respond @activity, :include => [:project, :target, :user, :thread_comments]
+      api_respond @activity, :include => [:project, :target, :user, :thread_comments, :uploads]
     else
       api_error :not_found, :type => 'ObjectNotFound', :message => 'Not found'
     end

app/controllers/api_v1/api_controller.rb

@@ -136,6 +136,8 @@ def load_references(refs)
       case ref_class
       when 'Comment'
         Comment.where(:id => ref.last).includes(:target).all
+      when 'Upload'
+        Upload.where(:id => ref.last).includes(:page_slot).all
       when 'Note'
         Note.where(:id => ref.last).includes(:page_slot).all
       when 'Conversation'

app/controllers/api_v1/comments_controller.rb

@@ -19,7 +19,7 @@ def index
 
   def show
     authorize! :show, @comment
-    api_respond @comment, :include => [:user]
+    api_respond @comment, :include => [:user, :uploads]
   end
 
   def create

app/controllers/api_v1/conversations_controller.rb

@@ -120,7 +120,7 @@ def add_watchers(hash)
   end
 
   def api_include
-    [:comments, :user] & (params[:include]||{}).map(&:to_sym)
+    [:comments, :user, :uploads] & (params[:include]||{}).map(&:to_sym)
   end
 
 end

app/controllers/api_v1/tasks_controller.rb

@@ -107,6 +107,6 @@ def api_scope
   end
 
   def api_include
-    [:comments, :user, :assigned] & (params[:include]||{}).map(&:to_sym)
+    [:comments, :user, :assigned, :uploads] & (params[:include]||{}).map(&:to_sym)
   end
 end

app/models/comment/conversions.rb

@@ -54,7 +54,7 @@ def to_api_hash(options = {})
       base[:previous_due_on] = previous_due_on
     end
 
-    if uploads.any?
+    if Array(options[:include]).include?(:uploads) && uploads.any?
       base[:uploads] = uploads.map {|u| u.to_api_hash(options)}
     end