add description to todo item assignment return

Change-Id: I4232f70f88c1d34310d66aa62525f56d9e4389e5
Reviewed-on: https://gerrit.instructure.com/6083
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>

Author: codekitchen

app/models/assignment.rb

@@ -1201,7 +1201,7 @@ def self.percent_considered_graded
   # This should only be used in the course drop down to show assignments recently graded.
   named_scope :need_submitting_info, lambda{|user_id, limit, ignored_ids|
     ignored_ids ||= []
-          {:select => 'id, title, points_possible, due_at, context_id, context_type, submission_types,' +
+          {:select => 'id, title, points_possible, due_at, context_id, context_type, submission_types, description, ' +
           '(SELECT name FROM courses WHERE id = assignments.context_id) AS context_name',
           :conditions =>["(SELECT COUNT(id) FROM submissions
               WHERE assignment_id = assignments.id
@@ -1216,7 +1216,7 @@ def self.percent_considered_graded
   named_scope :need_grading_info, lambda{|limit, ignore_ids|
     ignore_ids ||= []
     {
-      :select => 'assignments.id, title, points_possible, due_at, context_id, context_type, submission_types, ' +
+      :select => 'assignments.id, title, points_possible, due_at, context_id, context_type, submission_types, description, ' +
                  '(SELECT name FROM courses WHERE id = assignments.context_id) AS context_name, needs_grading_count',
       :conditions => "needs_grading_count > 0 #{ignore_ids.empty? ? "" : "AND id NOT IN (#{ignore_ids.join(',')})"}",
       :limit => limit,

lib/api/v1/assignment.rb

@@ -22,7 +22,7 @@ def assignment_json(assignment, includes = [], show_admin_fields = false)
   hash = assignment.as_json(:include_root => false, :only => %w(id grading_type points_possible position due_at))
 
   hash['name'] = assignment.title
-  hash['description'] = api_user_content(assignment.description)
+  hash['description'] = api_user_content(assignment.description, @context || assignment.context)
 
   if show_admin_fields
     hash['needs_grading_count'] = assignment.needs_grading_count

spec/apis/v1/todo_items_api_spec.rb

@@ -39,6 +39,7 @@
         'type' => 'submitting',
         'assignment' => {
           'name' => 'required work',
+          'description' => nil,
           'id' => @a.id,
           'muted' => false,
           'points_possible' => 10,
@@ -55,6 +56,7 @@
         'type' => 'grading',
         'assignment' => {
           'name' => 'text',
+          'description' => nil,
           'id' => @a2.id,
           'muted' => false,
           'points_possible' => 15,