Commit Graph

154 Commits

Author SHA1 Message Date
Brian Palmer 6260f57d61 set kaltura default max file size to 500mb
Change-Id: I15e632b386db3354a09f41480f8f196d81fd9d2f
Reviewed-on: https://gerrit.instructure.com/3466
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 16:25:34 -06:00
Zach Wily 7beaf4d764 fix update_account_associations job getting created for every imported user
Change-Id: Ia7dc8ca3912510114d88035e264e59ebb54fe086
Reviewed-on: https://gerrit.instructure.com/3446
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 14:26:18 -06:00
Zach Wily 5cf114b51e make plugins version display consistent
Change-Id: I5baf09e61d8b8f3a9ffb5cf1f7ceda741928491b
Reviewed-on: https://gerrit.instructure.com/3443
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 14:16:50 -06:00
JT Olds ceb3fa0c49 fix licensing on workflow library
Change-Id: I4c02f0a323a005947eb8bb046e171af8855937c4
Reviewed-on: https://gerrit.instructure.com/3436
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 12:25:21 -06:00
Jon Jensen 6d226272df cast columns in dynamic finders, warn on all-nil argument lists
in production mode we now cast to the appropriate type and issue a warning
if it can't be cleanly cast (e.g. '' -> 0). if all arguments are nil (or
empty arrays, e.g. find_by_id([])) and we aren't in a scope, issue a
warning (sometimes we really do want nil when we're in a scope, e.g. line
216 of app/models/folder/rb).

in development/test mode, we now raise errors in the two warning scenarios
above (though that is configurable).

fixed several places in the code where specs failed due to the change, or
where inputs to dynamic finders looked problematic

Change-Id: Ifea851cb14d3e89b6df08ade8e83934579678f8b
Reviewed-on: https://gerrit.instructure.com/3434
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 11:06:04 -06:00
JT Olds 03fae4c7dd banner does *not* have email addresses we can deterministically figure out for every user
Change-Id: If114f99f577affcc8f33ab743be45479f537cc52
Reviewed-on: https://gerrit.instructure.com/3376
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-29 14:39:24 -06:00
Brian Palmer dac5bdf0ce handle repeated qti imports of the same filename better, closes #4411
Change-Id: I61d67d5005b9073e5c937611014f0929e45562d1
Reviewed-on: https://gerrit.instructure.com/3367
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-29 12:33:31 -06:00
JT Olds 4c6c9056d1 be more paranoid when looking up users for sis
Change-Id: I4129ba2d687ba8d9cb6cdb363711635a6e443955
Reviewed-on: https://gerrit.instructure.com/3353
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-29 09:49:01 -06:00
Brian Palmer 276a906ee2 handle bulk media upload failures on import more gracefully, refs #4395
Change-Id: I0e5723879bcda114f6ad7cc34ee4ca1104136b97
Reviewed-on: https://gerrit.instructure.com/3333
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-29 09:31:36 -06:00
Bracken Mosbacker aae2b5f5f8 don't try to parse non-existent files
closes #4404

Change-Id: I53c4a64573499a723a3d149211f49728c1c75a00
Reviewed-on: https://gerrit.instructure.com/3355
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-29 08:53:23 -06:00
Brian Whitmer 43dcad71e0 send canvas ids with basic lti for "public" integrations
fixes #4369

Change-Id: I859a852ed0b585c90cffce3c9a30e39ece2b89e2
Reviewed-on: https://gerrit.instructure.com/3256
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Tested-by: Brian Whitmer <brian@instructure.com>
2011-04-28 19:52:31 -06:00
Brian Palmer 186fd8486b only export media objects that are used in RTE fields by the export
closes #4388

Change-Id: I24ae7f6dc0fef5c552c7eab43c76533a164b57f9
Reviewed-on: https://gerrit.instructure.com/3312
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-28 07:52:20 -06:00
Brian Palmer b710eefa4b don't load the import zip into memory during import initialization
Change-Id: I5995115045f325e3185a2d9fcdd37043f032636d
Reviewed-on: https://gerrit.instructure.com/3325
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-27 19:36:20 -06:00
Cody Cutrer d5c439b0c2 grade publishing results importer
Change-Id: I5279b8dadc9084858099b4b55aaf2dc8ef632a9a
Reviewed-on: https://gerrit.instructure.com/3134
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-27 16:45:49 -06:00
JT Olds 4457002281 sis grade publishing backend
Change-Id: I7338cae9275320aa6900758df22a3a8ac6a3718d
Reviewed-on: https://gerrit.instructure.com/3108
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-04-27 16:23:00 -06:00
Zach Wily 20092fb2c9 fix more find_by_id cases where we could pass in an empty string
Change-Id: I6bd72dd78f739edac6377f863f298fa14283be38
Reviewed-on: https://gerrit.instructure.com/3299
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-27 10:45:09 -06:00
Brian Palmer 23e71e669a remove attachments created on import soley for media object import
closes #4382

Change-Id: I1b79ac0ad1043450b7c5ade09f8509b76c9bdc85
Reviewed-on: https://gerrit.instructure.com/3298
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Brian Palmer <brianp@instructure.com>
2011-04-27 10:33:35 -06:00
Bracken Mosbacker 0944035cd7 use the unencoded filename for content zipper and exporting
closes #4381

Change-Id: I6165e3758fae7b26221a1123f39be551743de797
Reviewed-on: https://gerrit.instructure.com/3295
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-27 07:36:22 -06:00
Bracken Mosbacker 33a59edcf9 updated the xsd for calendar events and files/folders
refs #4373 #4378

Change-Id: I389a1c0e86be90d0409e00a7be3f304cb95a547a
Reviewed-on: https://gerrit.instructure.com/3283
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-26 14:55:20 -06:00
Bracken Mosbacker 961657a763 add calendar events to export/import
closes #4373

Change-Id: Ia7a771321da0542e393df64578d568d0111a08a3
Reviewed-on: https://gerrit.instructure.com/3282
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-26 12:28:31 -06:00
Brian Palmer 4a869c60d9 set max_attempts to 1 for import/export jobs, closes #4311
Change-Id: Ia671ac818bc2d2b0f2d14ea0ab934bbc3e9024c8
Reviewed-on: https://gerrit.instructure.com/3275
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-26 12:11:02 -06:00
Brian Palmer 63bd7380e6 fix time settings imported from respondus client
Change-Id: Iee6d44ae7bfad2b638735e6d232f0fa56f8f57ea
Reviewed-on: https://gerrit.instructure.com/3269
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-26 09:35:10 -06:00
Zach Wily 520de78d75 handle migrating file display names if they are different; fixes #4378
This refactors the file metadata a little bit to be more extensible.

Change-Id: Ia686ea0f5bdf552742d5b250a5d0baa9f9ebe5ec
Reviewed-on: https://gerrit.instructure.com/3268
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-26 09:04:28 -06:00
Bracken Mosbacker d8a300ebeb make sure quizzes with multiple <p> get imported correctly
closes #4376

Change-Id: If1670c4373e2f03439232dbc55d56ce8a1efe732
Reviewed-on: https://gerrit.instructure.com/3267
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-26 08:15:34 -06:00
Brian Palmer 9de2e9b9f1 export quiz question names, closes #4374
Change-Id: I8b019dd2a92b9c270be6ca820d79cb81fa8fdef8
Reviewed-on: https://gerrit.instructure.com/3263
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-25 23:25:12 -06:00
Brian Palmer 0ce2a5cc0a read cc syllabus on import as html, not xml, fixes #4371
Change-Id: Ic01c11018cc919d0e814347e99284c3cca02b040
Reviewed-on: https://gerrit.instructure.com/3262
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-25 22:54:15 -06:00
Bracken Mosbacker 40eba041a9 export all files with filename instead of display name
module content tags will rename a file if there is a
title set

closes #4343

Change-Id: I4e90921b8dab62b452f599135d683515bd342ba1
Reviewed-on: https://gerrit.instructure.com/3260
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-25 21:02:03 -06:00
Bracken Mosbacker 894f6c4aa5 copy file/folder lock status on export/import
closes #4345

Change-Id: I564d7b3be40789a9178a0ac0f192d528c2655f3e
Reviewed-on: https://gerrit.instructure.com/3259
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-25 21:00:13 -06:00
Cody Cutrer 98e68f9e4b export/import modules links. closes #4313
Change-Id: Ib4d789cf69a8492de958e2e2b68a3c85bf2fe8b5
Reviewed-on: https://gerrit.instructure.com/3254
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-25 16:21:47 -06:00
Brian Palmer d104ac86fa fix import filenames that have been escaped going through nokogiri, refs #4321
Change-Id: I9468482db75d628e9b3e75cbd307d83f990adcfb
Reviewed-on: https://gerrit.instructure.com/3250
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-25 15:50:31 -06:00
Brian Palmer f5c9ce98eb preserve extra file url params across import/export, closes #4321
Change-Id: Iab044664bc62a60dea26f7e65328e744e63e57a8
Reviewed-on: https://gerrit.instructure.com/3247
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-25 12:50:21 -06:00
Bracken Mosbacker 206aed825e allow import/export without kaltura configured
closes #4357

Change-Id: If1f7df936fbd012fcd26c0509b3b3f37188ca6f6
Reviewed-on: https://gerrit.instructure.com/3242
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-25 08:37:36 -06:00
Bracken Mosbacker 4e47be2c15 allow old quizzes to import unpublished
old quizzes will have an assignment even if they're
not published, this caused them to be published when
imported. This adds the available flag to know whether
the quiz is supposed to be published.

Also added another respondus column to the quiz export

closes #4351
closes #4347

Change-Id: Ic1f42f91dbee422a71e18fd9e627e303eb6ee27c
Reviewed-on: https://gerrit.instructure.com/3238
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-25 08:37:32 -06:00
Bracken Mosbacker 31374465fe export/import question banks
refs #3396

Change-Id: I4199264bf07e145be2b3949bc4a56a37cda715b7
Reviewed-on: https://gerrit.instructure.com/3223
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-25 07:29:12 -06:00
Zach Wily 8b6b9123a0 fix importing external url module items; fixes #4330
Module items that were tied to tableless class were getting the same
identifier, causing them to stomp on each other.

Change-Id: I577c7d3dbb86af7fb853b9548286841b7f001d03
Reviewed-on: https://gerrit.instructure.com/3236
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-25 07:27:20 -06:00
Brian Palmer 516d3a4495 export/import kaltura media content with cc exports/imports, closes #4256
Change-Id: I4d92cdedd2e304709886713977d91e33b162d232
Reviewed-on: https://gerrit.instructure.com/3232
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-23 23:51:01 -06:00
Zach Wily 6ae6488301 fix downloading S3 files in content zipper
Change-Id: Ia5b2eb5c5f645e5b527022631fbb2b1e7010b149
Reviewed-on: https://gerrit.instructure.com/3231
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-04-23 17:20:02 -06:00
Jon Jensen 48346a56cc basic wimba archiving support, closes #4263
added generic user_setting fu to conference classes so we can expose
conference-type-specific settings in the canvas ui

Change-Id: I37a30ad3643d358be1458f59da488f34f680bb8b
Reviewed-on: https://gerrit.instructure.com/3140
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-23 10:56:35 -06:00
Bracken Mosbacker 6b46bf6c6d import canvas cartridge qti
refs #3396

Change-Id: If9d1732f01c9243dda25741cbed20a919631f19e
Reviewed-on: https://gerrit.instructure.com/3218
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-23 10:49:06 -06:00
Zach Wily cfc40c4aa2 don't use URI.parse for S3 file downloading; fixes #4336
We have some underlying escaping issues that need fixing - this works around
the problem until we can fix them.

Change-Id: I867da68440a1625fb85174739e254b4a47771bde
Reviewed-on: https://gerrit.instructure.com/3226
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-22 23:51:18 -06:00
Zach Wily 7a482e0244 anchor link searches on exports so we link correctly; fixes #4337
Change-Id: Ibe28dbee1ab4cd21adc3d5bbf046ee31cd7517ea
Reviewed-on: https://gerrit.instructure.com/3215
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-22 23:34:11 -06:00
Zach Wily 6eec8d43d3 correctly handle /file_contents/ urls when exporting; fixed #4335
Change-Id: I6ce3f0f2c67ea29b33a7371b30087cc98a3ea2c2
Reviewed-on: https://gerrit.instructure.com/3214
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-22 23:34:03 -06:00
Zach Wily 2f3756fc37 optimize account association setup when saving enrollments
First of all, be smarter about when we do it - it's only necessary on new
records or when something in the enrollment changes that could affect account
associations.

Second, during SIS import, gather up each user that will actually need their
associations updated and do it at the end. Normally a user will get several
enrollments during a SIS update and this can reduce the amount of work we do
by a lot.

Change-Id: I2f095dd9e7e148229e52e6b5e8b6624dfe389c31
Reviewed-on: https://gerrit.instructure.com/3200
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-22 08:40:57 -06:00
Zach Wily 06e89cdb6e do default notification policy setup synchronously during SIS import
Change-Id: Ic619952b079d0774bb78fdd8cbb3b930b83bce28
Reviewed-on: https://gerrit.instructure.com/3199
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-22 08:23:51 -06:00
Zach Wily 3911ab3cd3 update account associations while creating users
Change-Id: Ie7eda5d1f27da0ee9da8b723ac151a63e97288c9
Reviewed-on: https://gerrit.instructure.com/3198
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-22 08:23:37 -06:00
JT Olds 33854cbc4b renaming last_course to nonxlist_course and changing crosslisting semantics
Change-Id: I0b017d4506c54151f34c50c28754b6e1c1a46691
Reviewed-on: https://gerrit.instructure.com/3171
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-21 15:43:39 -06:00
JT Olds b8e7f55d2f things aren't working right immediately after a fresh db:migrate
fixing error: Problem creating administrative account, please try again:
unknown attribute: password_confirmation

Change-Id: I6f7bc81569337744243f4c35b6a338635a339f60
Reviewed-on: https://gerrit.instructure.com/3177
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-21 15:11:02 -06:00
JT Olds 6e8acdf576 when creating a new crosslist course, prepopulate course data with existing section's course
Change-Id: I647c9ede4826b7e85c7906d9b24b95e056a7efff
Reviewed-on: https://gerrit.instructure.com/3162
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-21 15:01:43 -06:00
JT Olds f5149ad4d7 sis import feedback fixes
Change-Id: I81c96b0ca050c0888b20fa886b735b93bf92d1c4
Reviewed-on: https://gerrit.instructure.com/3161
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-21 15:01:37 -06:00
Zach Wily 359613861d look up the entire filename when converting URLs on import
Before we were stopping at ['"], but that was unecessary (and wrong) because
what we have is the actual, parsed attribute value. This also means we didn't
get a full filename if it had a quote in it.

Change-Id: Ib4b44a2bdf3f7dc0d2f216415c1fcbfd9ac3e126
Reviewed-on: https://gerrit.instructure.com/3178
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-21 14:33:51 -06:00