Commit Graph

213 Commits

Author SHA1 Message Date
Brian Palmer ba20f27352 optimize get_all_pertinent_contexts, especially for /calendar
By scoping the finds to the user, we can avoid a lot of grants_right
lookups and the associated db queries. This is especially helpful for
users who belong to a lot of groups or courses.

Change-Id: I31e22ecddf9456734d6c1297d776a8353e43a526
Reviewed-on: https://gerrit.instructure.com/2486
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-01 14:45:04 -07:00
Brian Whitmer dbe9fd9a6b don't let unlogged users access /accounts
fixes #3899

Change-Id: I45edd0cd4ccfe6676ddc9e62aab570f9f090de47
Reviewed-on: https://gerrit.instructure.com/2468
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-01 14:21:30 -07:00
Brian Whitmer 4f2829da0b on quiz instructions page, "always available" isn't lined up
fixes #3047

Change-Id: Ie5b02bdd70cffb4ac1ce3c070552d6509b7a9453
Reviewed-on: https://gerrit.instructure.com/2465
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-01 13:58:08 -07:00
Brian Whitmer fd8b51a083 change 'record media' on assignment submission to be a button
the link really was kind of hard to find

fixes #3227

Change-Id: Ia6ee04e944336f60cd2061ec9a44194c46511e31
Reviewed-on: https://gerrit.instructure.com/2476
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
2011-03-01 13:55:11 -07:00
Brian Whitmer 02cb5c4d92 default attempt limit on quizzes should be higher than 1
fixes #3469

Change-Id: Ic2646b868d46c7c3a428e47435baeb5e8f8269ef
Reviewed-on: https://gerrit.instructure.com/2466
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
2011-03-01 13:55:04 -07:00
Brian Whitmer 41c9f12988 enforce term/course/section start and end dates
before we were recording these values but not doing
anything about it.  This commit starts scheduling
delayed_jobs to activate/conclude enrollments
in the background when dates pass.

it does not conclude/publish courses/sections
automatically, though.  if we want that to be
automated based on dates then I think we should
do that in a separate commit.

fixes #3356

Change-Id: Id94356fbc5b82196dd041fdb250607a7633cee9f
Reviewed-on: https://gerrit.instructure.com/2431
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-01 13:47:12 -07:00
Brian Whitmer 98c6d03cc9 speed improvements for files page
there's was a lot of unnecessary database calls going
on, should be a little faster now.

fixes #3939

Change-Id: I9a43e0d801bc632d16248ad92b7c9ff16d1673eb
Reviewed-on: https://gerrit.instructure.com/2484
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-01 13:21:03 -07:00
Brian Palmer 62f22d9df7 optimize group loading on courses#show page
Change-Id: I8db43095d2b6f71822624dc2b3134caa1f8748f4
Reviewed-on: https://gerrit.instructure.com/2480
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-01 11:49:31 -07:00
Brian Palmer 18cd4a4491 remove trailing comma in js object literal
Change-Id: If1d66971a39ee97352a2116c02564c2ccc2cdc3e
Reviewed-on: https://gerrit.instructure.com/2473
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-28 17:00:22 -07:00
Brian Whitmer bbd6b8f6dd "add assignment" link doesn't come back
on empty "Assignments" screen, click "add assignment" then
delete it, the "add assignment" link doesn't come back

also fixed scrolling on assignments page to feel less
jumpy when you're editing stuff

fixes #289

Change-Id: Ia0de43b768b851ef3ef2de68b861ab0b8b531095
Reviewed-on: https://gerrit.instructure.com/2441
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-28 15:51:38 -07:00
Zach Wily f4c44aa86a fix media comments in the same html block; fixes #3923
When two media comments were in the same html block, we were accidentally
finding the media_id for the first one when building the media comment
thumbnail.

Change-Id: I31ce651e1a7654ed9ede6eca7c3abb8d70f7a2bc
Reviewed-on: https://gerrit.instructure.com/2462
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-28 14:23:31 -07:00
Ryan Shaw 3ada5ea514 fix unclosed paren that made quizzes not work in speedGrader
fixes: #3919

Change-Id: If43e00d1553572ddf3e5aa140292636e5e988051
Reviewed-on: https://gerrit.instructure.com/2461
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-28 14:19:43 -07:00
Ryan Shaw 8c419e048e fix display of gradebook in firefox if you zoom out.
the root of the problem is when we set the width of the
$row for the header and each row in the table.  each of
the .cell's are float:left'ed and so we need to set a
total width of the container.  when you zoom out the
border width of 1px did not shrink so there was no room
in the container to float:left the last cell so it
wrapped to a new line.

Change-Id: I01d3b4e04edc3befff3e4366a5b7f5afe5672703
fixes: #3891
Reviewed-on: https://gerrit.instructure.com/2409
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-28 14:19:15 -07:00
Ryan Shaw 535e2c13d4 patch tinymce to not scroll to top on shift+enter in webkit.
fixes zendesk 3520

Change-Id: I0860e7cb224dacb17cb76eefc2cb1a9fb76149a0
Reviewed-on: https://gerrit.instructure.com/2352
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-28 14:18:15 -07:00
Brian Whitmer 118a46311d can't add content to second tinyMCE editor loaded
problem with scoping.  The $editor value was being set
the first time the plugin was initiated and then never
updated, which means these plugins could only insert
content into the first editor loaded.

Also fixed the $.indicate to scroll and highlight
as expected.

fixes #3725

Change-Id: Idc1f6b5692631b6e05c8233c2774d714312d247b
Reviewed-on: https://gerrit.instructure.com/2438
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-28 13:20:54 -07:00
Bracken Mosbacker 52aa6fb4a8 don't show feedback for deleted assignments
closes #2993

Change-Id: I896f32b6b84419fe839b8c2b576119b0cd23aeff
Reviewed-on: https://gerrit.instructure.com/2361
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-02-28 10:50:23 -07:00
Jon Jensen da5921a8da include original filenames in submission zip archives, closes #3866
Change-Id: I1bc840d73abf973c3f4c784f28a6f6c304ce4ac8
Reviewed-on: https://gerrit.instructure.com/2404
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-28 09:31:47 -07:00
Jon Jensen f3df3c4665 fix assignment group hiding, closes #3800
Change-Id: I4a7ebbdec04aa06991a3be580a793993139b5dbe
Reviewed-on: https://gerrit.instructure.com/2444
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-28 09:28:33 -07:00
Ryan Shaw a114f8073d allow deleting sub-accounts that had "deleted" courses.
Change-Id: Ie91990416ea1dae4a3287af227616faa9b073714
fixes: #3794
Reviewed-on: https://gerrit.instructure.com/2423
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-28 08:54:15 -07:00
Zach Wily 46157ee57c fix html escaping in facebook app
Change-Id: I914be9d6eb4dcc7b3635f174cb9e57dcfe04060d
Reviewed-on: https://gerrit.instructure.com/2460
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-28 08:30:00 -07:00
Zach Wily 470963c56e fix "fill in multiple blanks" question types; fixes #3912
This was leftover from the removal of OpenObject from the quizzes.

Change-Id: I586c55133eefdc76f9c77d58d1bae3f339628264
Reviewed-on: https://gerrit.instructure.com/2450
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-25 21:37:56 -07:00
JT Olds 3d229d9ea4 optionally scale siscsv progress to some subsection of total work
Change-Id: I99cb59667c2fb57aac194b6c06777f8c6c4ffb2e
Reviewed-on: https://gerrit.instructure.com/2448
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-25 16:14:09 -07:00
Bracken Mosbacker ebdd5cbcf0 made account reports support default reports
refs #3903

Change-Id: Ie0e9778ebd4a29fe63d798c9ca20784703076410
Reviewed-on: https://gerrit.instructure.com/2442
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-02-25 15:00:58 -07:00
Jon Jensen 86b062bf61 wimba integration, fixes #2989
added wimba web conferencing support, moved dimdim config into plugin
settings, fixed a few web conferencing ui issues

Change-Id: I6b36b0e594a9f296d14cd35bec02186478bcbd13
Reviewed-on: https://gerrit.instructure.com/2343
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-25 14:35:14 -07:00
Jon Jensen 820fa03212 when changing contexts, don't blank the message form, closes #3865
Change-Id: Id1733e2002f8ce76bb21d2d2f521dd65c9b58da0
Reviewed-on: https://gerrit.instructure.com/2424
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-25 14:34:47 -07:00
Jon Jensen dbfbf569dd put error balloon in the right place, closes #3792
Change-Id: I44f71eadedca68af35760f8fc5e5ea3a57577834
Reviewed-on: https://gerrit.instructure.com/2437
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 17:25:44 -07:00
JT Olds 34263ed8de making download public
Change-Id: I88a7d076faf306c935f71153908f6de29f6770da
Reviewed-on: https://gerrit.instructure.com/2436
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-24 17:20:45 -07:00
JT Olds bedb1d878e fix default host for tests
Change-Id: I88b59c05a39803c95e3d306b9f47b7ef0450d4c8
Reviewed-on: https://gerrit.instructure.com/2429
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-24 17:11:18 -07:00
Brian Whitmer 0dc9cb5b62 pretty sure this is supposed to be a semicolon
Change-Id: Iecf4dec0ad29b6bfe59f5fd755df3fb3ac6d3484
Reviewed-on: https://gerrit.instructure.com/2430
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-24 16:21:34 -07:00
Zach Wily 0a084625fa fix escaping when replying to inbox items, fixes #3908
Change-Id: I935601cd2aac4537cfba0cd4b68248c738d836ec
Reviewed-on: https://gerrit.instructure.com/2434
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 16:08:03 -07:00
Brian Palmer 202effa992 escaping of enrollments in course drop down, fixes #3907
Change-Id: If995936a602f9e0fb43bf756d52c2522731d7947
Reviewed-on: https://gerrit.instructure.com/2433
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 15:31:08 -07:00
JT Olds 96e746c31e making other import types supported via plugins
Change-Id: I689c374060fbfcc89eb79b918ea2db283c6eb99c
Reviewed-on: https://gerrit.instructure.com/2425
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-24 15:15:53 -07:00
Brian Palmer 4e05ce3524 breadcrumbs are now escaped
Change-Id: Ice45457db7597c0d0e2da46b062ba02e17c843a7
Reviewed-on: https://gerrit.instructure.com/2427
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 13:03:35 -07:00
JT Olds 77b31810c6 hide wiki pages marked hidden from students
closes #1865

Change-Id: I582d566fd83575e70502dd682ca0347a436e194c2
Reviewed-on: https://gerrit.instructure.com/2422
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-24 10:12:41 -07:00
Ryan Shaw a8443755bc dont show media comment both inline and in modal dialog
fixes #3887

Change-Id: I2ada94bdcd79332ef0d0fb6a98ee7459e18f6693
Reviewed-on: https://gerrit.instructure.com/2405
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 09:38:12 -07:00
Zach Wily ba7b585193 fix escaping in faculty notes, refs #3888
Change-Id: Ia5ff98778570059bab62b64152285dd68b734024
Reviewed-on: https://gerrit.instructure.com/2419
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-24 07:07:00 -07:00
Brian Palmer 099fe50e72 don't strip tags on plain text discussion entries, fixes #3892
The format_message call takes care of escaping HTML entities.

Change-Id: Ifb6f890903ee00c8098ee8596d4b66d18a2b9054
Reviewed-on: https://gerrit.instructure.com/2418
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-23 16:29:37 -07:00
Zach Wily ba6e8d8b64 fix escaping in autocompleted course search, refs #3888
Change-Id: I4e778bca558bff3aac0f5582653468c6d6a8b5fa
Reviewed-on: https://gerrit.instructure.com/2416
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 16:22:34 -07:00
Zach Wily b9f8fc8dfb fix escaping in gradebook (Hide All on group), refs #3888
Change-Id: I74323aa57875b1da1838715874af56e8b850b7f0
Reviewed-on: https://gerrit.instructure.com/2414
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 16:22:27 -07:00
JT Olds 1f9894cb98 improving anonymous survey anonymity
* speed grader now requires hidden student names on anonymous surveys
 * quiz moderation no longer presents student names
 * anonymous surveys no longer provide a list of students who have not taken
   the survey

closes #3793

Change-Id: I7d48766600522b36379e8ae6d2a72486d2ce3ed7
Reviewed-on: https://gerrit.instructure.com/2407
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-23 16:11:13 -07:00
Brian Palmer bec0621928 escape student names in speed grader drop-down, fixes #3890
Change-Id: I9ac4ade75db819c8e32dddc67c3aa8d8b4e58536
Reviewed-on: https://gerrit.instructure.com/2415
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 15:26:01 -07:00
Brian Palmer 9b627b0e6e break SIS error/count reports into partials, fixes #3889
Change-Id: I2811b01392c2320654e237f1840b918bc58dedc6
Reviewed-on: https://gerrit.instructure.com/2412
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 14:54:27 -07:00
Zach Wily 16eecfd4dc fix escaping in messages, refs #3888
It's unnecessary to html unescape the subject and body anymore, as they are
already unescaped.

Change-Id: I10b13805a42c677e1309983c77f1aa62e56e8578
Reviewed-on: https://gerrit.instructure.com/2413
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 14:37:42 -07:00
Zach Wily 98bf5f0674 fix escaping submission comments in speedgrader, refs #3888
Change-Id: I5866a1029bee2f44d3a7caf5700944b729a6a417
Reviewed-on: https://gerrit.instructure.com/2411
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 14:09:05 -07:00
Zach Wily 0858d4e337 fix escaping issues with quizzes
Since plaintext fields are stored raw in the database, a lot of the previous
escaping/unescaping behavior in quizzes has changed.

Change-Id: I299fa7979a30b1efa8944c6df7150b82980c47c5
Reviewed-on: https://gerrit.instructure.com/2403
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-23 14:08:29 -07:00
Zach Wily 39db2a2199 html escape assignment titles in gradebook importer, refs #3888
Change-Id: Ia13827f3ef8c28c18c74b57093a5ed219e67a88e
Reviewed-on: https://gerrit.instructure.com/2408
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 14:05:48 -07:00
Brian Palmer 8868162722 set HostUrl email config options on each request in dev mode
refs #3880

Change-Id: If5647283b2018c457ac77fb61320eb384423806e
Reviewed-on: https://gerrit.instructure.com/2410
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-23 14:02:43 -07:00
Zach Wily 3ebda084fe fix a lot of html escaping issues
These issues arose from a change in the way we are storing plaintext fields in
the database. Previously they were stored html escaped, and now they're not.
Fixed areas include:

 * folder names in file manager
 * new course sub-account dialog
 * grading rules for assignment groups
 * event titles in calendar
 * content locks page
 * outcomes inside rubrics
 * course listing while writing feedback
 * copying file between contexts in file mgr
 * sis import screen logs
 * file upload options in wiki sidebar

Change-Id: Iab8c8deb81fdfd9062570288218db4180204a497
Reviewed-on: https://gerrit.instructure.com/2406
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-23 12:25:34 -07:00
Brian Palmer 17b89a1751 add support for using sendmail for outgoing mail, closes #3880
This involved some refactoring, since we were using
ActionMailer::Base.smtp_settings[:domain] for generating "From"
addresses.

Change-Id: I6cac6d48971d396a56e07314e042b63a0081a4b6
Reviewed-on: https://gerrit.instructure.com/2398
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 08:41:50 -07:00
Brian Palmer fc4a866af8 continue to raise on serializing an unsaved model to a delayed job
This capability got lost in the move to native YAML serialization.

refs #1

Change-Id: Id7ea4d635f74732d793c53f0fd34304730ade978
Reviewed-on: https://gerrit.instructure.com/2402
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 08:32:37 -07:00