Commit Graph

67 Commits

Author SHA1 Message Date
Bracken Mosbacker a03dd41895 don't allow single item failures to stop a whole import
Before if any single item had an error the whole import
errored out. This lets items fail and the rest continue to
import. The single item failures are logged as warnings in
the ContentMigration and this allows the user to know what
failed.

All the warnings/failures are also shown on the migration
list page to help admins diagnose problems.

refs #4903

Change-Id: I66b81ce1c243258dfc8c1d7d1381b2ea8daa3e72
Reviewed-on: https://gerrit.instructure.com/4268
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-17 12:21:59 -06:00
Brian Whitmer ebe1c46d0c concluded teachers should still have access to student grades, content
Concluded teachers should be able to see quiz statistics,
a read-only view of quizzes, student grades, discussions,
files (including download).  They should not be able to
change any grades, however.

fixes #4059

Change-Id: Ie44a29074ec27b9d0afb908b31f51b46b0e98728
Reviewed-on: https://gerrit.instructure.com/2783
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-06-09 16:08:45 -06:00
JT Olds 2bf5c22c5f allow admins to search for names in other fields
closes #4450, #4762, refs #4497

course.name_like now searches name, sis_source_id, and course_code
user.name_like now searches user.name, user.short_name, pseudonym.sis_user_id,
  pseudonym.unique_id

Change-Id: If15255b3745139553a68fa2b6e768b4755394214
Reviewed-on: https://gerrit.instructure.com/4078
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-09 10:35:08 -06:00
Bracken Mosbacker fc1863195d don't fail when copying wiki pages with no title
wiki pages with no title exist from old external
migrations that use to allow this to happen, this
change prevents course copies from failing when
trying to copy those wiki pages

closes #4801

Change-Id: I50389f30e4553178c04fafb634a5e023fb4e836a
Reviewed-on: https://gerrit.instructure.com/4107
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-08 12:53:47 -06:00
JT Olds 2fabedd7f1 refactor abstract courses stage 1
remove dependence on abstract courses

Change-Id: I2d533daed094de05b1942ed4565cda7734a30bf3
Reviewed-on: https://gerrit.instructure.com/4088
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-07 14:37:38 -06:00
Bracken Mosbacker e15cb0e085 added fields for editing sis_source_ids and new sis permission
closes #4475

Change-Id: Ie6da7ec45dcba65409c0909d180358a3796319dc
Reviewed-on: https://gerrit.instructure.com/3944
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-31 17:53:46 -06:00
JT Olds d2c0dbef95 using update_all for enrollments when publishing grades
Change-Id: I231318891c9896e7e2fc083eaddaa5010a1b2bcf
Reviewed-on: https://gerrit.instructure.com/3940
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-31 14:40:26 -06:00
JT Olds 0d4102082d grade exchange fixes
Change-Id: Ica73e07a633b533f767624088dab150fcaa9506b
Reviewed-on: https://gerrit.instructure.com/3742
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-05-31 13:42:11 -06:00
JT Olds c63bd9c558 keep crosslisted course data up-to-date via sis imports for original course
Change-Id: Ibfbc5a22c8778bd5188505812f3f5abbdd807578
Reviewed-on: https://gerrit.instructure.com/3652
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-31 13:03:05 -06:00
JT Olds 654bf600cf update course account associations on section save
Change-Id: I97f88e43c489691ab5f63a28e4d0695f6c8096b6
Reviewed-on: https://gerrit.instructure.com/3673
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-05-31 13:02:54 -06:00
Bracken Mosbacker 0d8b4fce33 copy learning outcomes during course copy
closes #3805

Change-Id: I186c2ed323c5aeb29a5dfd6c40da1245c72086ee
Reviewed-on: https://gerrit.instructure.com/3846
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-25 16:26:30 -06:00
Brian Palmer 6422260805 unconclude course in the ui, closes #3631
Change-Id: Ie99613aeda9c1cb1ebe3d343de39abf05d0ec534
Reviewed-on: https://gerrit.instructure.com/3811
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-24 11:52:05 -06:00
JT Olds 9ac67063f0 don't keep track of account_id for crosslisting purposes.
instead, use nonxlist_course for account associations

Change-Id: Id7b41d69b58662a811fad59e5133ea46634976a2
Reviewed-on: https://gerrit.instructure.com/3672
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-24 10:34:53 -06:00
Cody Cutrer bee62d4bb4 ask account for course permissions fixes #4488
Instead of looking up the AccountUser directly by account and root
account, just ask the Account, which will follow the chain to the
root account, and the site admin account as well.

Change-Id: I4271561c69c4c353a4893a64ca2809cfb8b41c35
Reviewed-on: https://gerrit.instructure.com/3778
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-23 11:06:32 -06:00
Brian Whitmer 70e984bff6 grading standards improvements
- can attach a grading standard to a course
- interface for managing standards at the course
  and account level
- added final grade to gradebook page
- added final grade to student grades page
- added final grade to gradebook csv export

fixes #3868

Change-Id: I555b9f66b621d8967e893e50a671748267da9373
Reviewed-on: https://gerrit.instructure.com/3025
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-21 19:20:34 -06:00
Bracken Mosbacker 0978ed453f handle extra image html in qti data
refs #4514

Change-Id: I14e64000648557ff199f7ca16c7172a6d95e35b7
Reviewed-on: https://gerrit.instructure.com/3649
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-16 10:24:00 -06:00
JT Olds 773a9bb444 cleaning up course_account_association updates
Change-Id: I2f65c15b2d3df633e8f6206656fd7ea5efa7c64c
Reviewed-on: https://gerrit.instructure.com/3670
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-16 08:23:24 -06:00
Cody Cutrer 799c7f0164 update course account associations synchronously during import
Change-Id: I6c27bf7964987a27e7e019556e35b683987d90ed
Reviewed-on: https://gerrit.instructure.com/3521
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-05-09 10:20:38 -06:00
Cody Cutrer f7c1477e36 some more strategic caching and passing on actual objects rather than just ids
refs #3752

Change-Id: I7a660e35434128712be31b3c335bc6d2c5edc98f
Reviewed-on: https://gerrit.instructure.com/3522
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 14:02:13 -06:00
Cody Cutrer 7505e1d303 avoid force-reloading data from the database if possible
refs #3752

Change-Id: I7eb25aafd59ff1c785de2f318117336827e776cc
Reviewed-on: https://gerrit.instructure.com/3516
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 14:01:56 -06:00
JT Olds 128fc92e32 give plugins a way to inject alternate grade export formats
Change-Id: Icd4ddc52cc3190ba28fb1d93821642ef2b119a3c
Reviewed-on: https://gerrit.instructure.com/3323
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-06 09:44:51 -06:00
Cody Cutrer 7ba5d5e3b2 revoke access from prior users to deleted courses fixes #4460
Change-Id: I0b3531302b40415b5aa39574d02683511cb30002
Reviewed-on: https://gerrit.instructure.com/3448
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 14:23:07 -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
Brian Palmer 62e844340a don't copy course name/code and fix start/end dates
fixes #4436

Change-Id: Ie30571134a01a0ad26da4fa3142722d2107d4207
Reviewed-on: https://gerrit.instructure.com/3421
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-02 17:49:29 -06:00
Cody Cutrer 07d8e90e18 fix date shifting for export/import
* assignments associated with quizzes or rubrics were getting saved
   unexpectedly, so weren't getting added to the list of items to
   shift
 * quizzes just flat out weren't getting shifted

Change-Id: Id6aa4fc666b31f4529920687a4e9019fcdd49508
Reviewed-on: https://gerrit.instructure.com/3417
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-02 13:57:46 -06:00
Cody Cutrer 8a9dfaa6b5 no more geometric series for shift_date fixes #4224
"fix" course.real_start_date before entering the loop that we call
shift_date so that we're always relative to that original start_date

Change-Id: I1dfb8b0f77d3d69f106c07a0d8970e0cb391b187
Reviewed-on: https://gerrit.instructure.com/3410
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-02 13:57:41 -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
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
Brian Palmer 38e8304c40 make kaltura errors on import non-fatal, closes #4395
And show non-fatal errors to the importing user.

Change-Id: Ib1c28a3bedb0d7f0805c483721cf569db40d72c9
Reviewed-on: https://gerrit.instructure.com/3328
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-29 09:30:54 -06:00
JT Olds 6d9f6790f7 sis_user_id is actually the user_id field from users.csv
Change-Id: Ic21ad5d0dbdd0f0fb732a83c530f0f4c78745915
Reviewed-on: https://gerrit.instructure.com/3351
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-28 15:02:57 -06:00
Bracken Mosbacker 814c692a24 fix nil error for removing unneeded media objects
refs #4382

Change-Id: I567dd839a61c4bcfdc0c9e5694b9b0e22d5363c9
Reviewed-on: https://gerrit.instructure.com/3317
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-27 17:00:47 -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
Cody Cutrer 47601e1e4e copy/import module links correctly. fixes #4312
Change-Id: I98ecc6bb63252269bf789320a8a5b2de5612efda
Reviewed-on: https://gerrit.instructure.com/3308
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-27 14:49:16 -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
Zach Wily 4f0af3da8c import course settings after files; fixes #4377
Change-Id: If76b45dae38d00d6d981337bb8fd1eb092bd6b2f
Reviewed-on: https://gerrit.instructure.com/3266
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-26 01:18:12 -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 b323c7a29a don't use course code as a regex; fixes #4344
Change-Id: If44af4b4e2fd81a9fc5f7dc92dec4ad98bf3702b
Reviewed-on: https://gerrit.instructure.com/3227
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-23 10:17:00 -06:00
Zach Wily 08108711ed Merge remote branch 'origin/ims_cc'
Change-Id: I7581cfa8cce0a49ab83fdd84c3e193996f44d7b6
2011-04-19 08:11:52 -06:00
Bracken Mosbacker 9a93fd4f21 try to find attachment id for relative urls on import
closes #4281

Change-Id: If0a6fb5dc2cd55e103e3b9897c82eb42ea01e43e
Reviewed-on: https://gerrit.instructure.com/3142
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-19 08:10:47 -06:00
Brian Palmer 27adf9b16a Merge branch 'ims_cc'
Change-Id: I7fc8590ab50d9ec062fd3cf609aa11f034ed582f
2011-04-18 10:20:36 -06:00
Bracken Mosbacker 9c058e377d import canvas cartridge discussion topics
refs #3396

Change-Id: Ie50ab50575e386c523be2e374fd9ae4b088a1129
Reviewed-on: https://gerrit.instructure.com/3121
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:56 -06:00
Bracken Mosbacker cf6908801a fixes to make importing a canvas cartridge from ui work
this commit fixes a bunch of problems with importing
a whole export package and updates the UI

refs #3396

Change-Id: Ia344b385e06df2f08bb75878234a7712a036e4b3
Reviewed-on: https://gerrit.instructure.com/3085
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:34 -06:00
Bracken Mosbacker 61771933bb importing more canvas export objects
This imports the syllabus, rubrics, and modules

refs #3396

Change-Id: Ie7802aa5a064f8cee471af9bfe0a23bf224831a6
Reviewed-on: https://gerrit.instructure.com/3064
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:28 -06:00
Bracken Mosbacker 84c048e5e6 importing more canvas export types
Added external feeds, grading standards, and learning outcomes

refs #3396

Change-Id: I138f22a6d5793e21ba49388e16be75d5f80f0e12
Reviewed-on: https://gerrit.instructure.com/3043
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:23 -06:00
Bracken Mosbacker bb8bc24cd7 start canvas cartridge importing
started the framework for importing the canvas flavored
common cartridge packages. There is also some minor
refactoring of the export step to allow for easy testing
of both exporting and importing

course settings, assignment groups, and external tools
are imported and tested with this commit

refs #3396

Change-Id: I4e8a2ebfc9df7e31f8859b189fea23f9584d7ef4
Reviewed-on: https://gerrit.instructure.com/3042
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:16 -06:00
Zach Wily df3d4c6351 use something more secure than UUID for our unique tokens; fixes #4264
Change-Id: I407b50b98e44eab4e341b596ebefe9f35af3dc37
Reviewed-on: https://gerrit.instructure.com/3097
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-15 10:54:47 -06:00
Bracken Mosbacker fc4cc9ff46 added ui for course exports
refs #3396

Change-Id: I07c30535e042dada7c7d4174a7bb8148b7f6b1fb
Reviewed-on: https://gerrit.instructure.com/3039
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:27:14 -06:00
JT Olds 3a171d27d2 renaming final_grade to final_score in relevant places. adding computed_final_grade
Change-Id: I09cfecc6ec075b1b45e872a6a1f2efa7e4bd63b9
Reviewed-on: https://gerrit.instructure.com/3034
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-12 12:58:28 -06:00
Cody Cutrer bb84334ee9 Add modules to links list in wiki sidebar. Closes #3824.
* Add modules to wiki sidebar
 * Fix redirect from courses/:id/modules/:module_id to courses/:id/modules#module_:module_id, rather than just courses/:id/modules
 * Auto-expand the specified module when you access modules/#module_:module_id

Change-Id: Iaa2ab30dc462fec753fe67928fb101212cff440a
Reviewed-on: https://gerrit.instructure.com/3021
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-11 14:47:37 -06:00
Zach Wily e4d88c5fcb optimize gradebook_json
Change-Id: Ib780ade2a6c89dd508c8df467c9e0f13497f189c
Reviewed-on: https://gerrit.instructure.com/2936
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-01 16:10:35 -06:00