fix expanding zip files for groups in new files

also a couple other minor tweaks

test plan:
* enable better file browsing
* create a group
* visit the group files page
* upload a zip file
* extract the zip file
* should run successfully

closes #CNVS-18590

Change-Id: I57546b6c77302d7bef67ddbc9a10696670f38881
Reviewed-on: https://gerrit.instructure.com/48884
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
This commit is contained in:
James Williams 2015-02-17 08:56:10 -07:00
parent 4736b11634
commit e2af2190a2
2 changed files with 5 additions and 4 deletions

View File

@ -46,7 +46,7 @@ define [
# get the content migration when ready and use progress api to pull migration progress
getContentMigration: =>
$.getJSON("/api/v1/courses/#{@contextId}/content_migrations/#{@contentMigrationId}").then (results) =>
$.getJSON("/api/v1/#{@contextType}/#{@contextId}/content_migrations/#{@contentMigrationId}").then (results) =>
if (!results.progress_url)
setTimeout( =>
@getContentMigration()
@ -68,9 +68,9 @@ define [
onMigrationComplete: ->
# reload to get new files to appear
promise = @folder.files.fetch({reset: true}).then =>
@deferred.resolve()
@folder.folders.fetch({reset: true}).then =>
@folder.files.fetch({reset: true}).then =>
@deferred.resolve()
trackProgress: (e) =>
@progress = (e.loaded/ e.total)

View File

@ -88,6 +88,7 @@ class UnzipAttachment
# Tempfile will unlink its new file as soon as f is garbage collected.
def process
Folder.reset_path_lookups!
with_unzip_configuration do
zip_stats.validate_against(context)