ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

order exports in /courses/X/content_exports 

fixes CNVS-14765

test plan:
 - have a course with multiple content exports
 - /courses/X/content_exports should display them in order
   by date, descending

Change-Id: I76356ab83b9631dd192dea18c331b425505a92d2
Reviewed-on: https://gerrit.instructure.com/39252
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
This commit is contained in:
Jeremy Stanley 2014-08-13 14:14:53 -06:00
parent 7dce219353
commit 5c09df93e5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/content_exports_controller.rb
View File

@ -27,7 +27,7 @@ class ContentExportsController < ApplicationController
end end
def index def index
@exports = @context.content_exports_visible_to(@current_user).active.not_for_copy @exports = @context.content_exports_visible_to(@current_user).active.not_for_copy.order('created_at DESC')
@current_export_id = nil @current_export_id = nil
if export = @context.content_exports_visible_to(@current_user).running.first if export = @context.content_exports_visible_to(@current_user).running.first

2
spec/controllers/content_exports_controller_spec.rb
View File

@ -75,7 +75,7 @@ describe ContentExportsController do
user_session(@teacher) user_session(@teacher)
get :index, course_id: @course.id get :index, course_id: @course.id
response.should be_success response.should be_success
assigns(:exports).map(&:id).should == [@acx.id, @tcx.id, @tzx.id] assigns(:exports).map(&:id).should =~ [@acx.id, @tcx.id, @tzx.id]
end end
end end