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

Google docs tab will appear when using file extension filters 

Fixes PLAT-936

Test Plan:

Attempt to load google docs tab on an assignment submission
with file extension restrictions turned on

Change-Id: Iaa11ef90b36e9732579dc2179a22719bd9148d61
Reviewed-on: https://gerrit.instructure.com/49698
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
Tested-by: Brad Horrocks <bhorrocks@instructure.com>
This commit is contained in:
Brad Horrocks 2015-03-02 11:01:22 -07:00
parent 955fcf47c8
commit 04ca108451
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/assignment.rb
View File

@ -1766,8 +1766,7 @@ class Assignment < ActiveRecord::Base
def allow_google_docs_submission?
self.submission_types &&
self.submission_types.match(/online_upload/) &&
(self.allowed_extensions.blank? || self.allowed_extensions.grep(/doc|xls|ppt/).present?)
self.submission_types.match(/online_upload/)
end
def <=>(comparable)