Commit Graph

6951 Commits

Author SHA1 Message Date
Sterling Cobb 335fb7b44f fix multiple due dates from overlaping in modules
fixes CNVS-12637

When you go to the modulese page if you had multiple due dates it would
overflow into the pts column. This no longer does this.

Test Plan
---------
As a teacher
Given I have multiple sections set up in a course
And I've added an assignment to the modules page
And that assignment has multiple due dates on it
And that assignment has points on it
When I go to the modules page
I should the module item with multiple due dates text
And it should not be overlaping the points column

Change-Id: I77557f10eb83a1acca4aa21ad4b9d7ab1de2004d
Reviewed-on: https://gerrit.instructure.com/34387
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-05-07 21:42:09 +00:00
Cody Cutrer 07d26345a0 avoid conflicts in otp used redis key
refs CNVS-1505

Change-Id: Iee6e1b0101616fe4e9daeba8f3c72b031ba04244
Reviewed-on: https://gerrit.instructure.com/34483
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-05-07 21:18:25 +00:00
Michael Nomitch 09bee64dba csv downloads working with new gb urls
refs CNVS-11966

test plan:
  -with srgb ff on
    - download a csv from srgb
    - download a csv from gb2
    - upload a gradebook csv
  -with srgb ff off
    - download a csv from gb2
    - download a csv from gb1
    - upload a gradebook csv

Change-Id: Ib63c65adbdb650852f3541e8045b103dd5fb7a21
Reviewed-on: https://gerrit.instructure.com/34100
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Tyler Pickett <tpickett+gerrit@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-07 20:42:54 +00:00
Jeremy Stanley 4548797744 clean up question import SQL parameter binding
test plan:
 - import the evil_angel.zip Angel package into Canvas
 - you should not have a migration issue referring to
   a SQL syntax error encountered when importing a
   quiz question
 - test quiz and question bank imports and re-imports

fixes CNVS-12899
fixes CNVS-12901

Change-Id: I26dcf5ffd4c6b6320232a7603ae2688f7c860fac
Reviewed-on: https://gerrit.instructure.com/34434
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-05-07 20:15:11 +00:00
Josh Simpson 854bae635b fix yard documentation for polling controllers
fixes CNVS-12913
YARD documentation needs to be above the explicit class it's referencing
and documenting.

Change-Id: I9e143c1f5300cad4abaa04f21c76820e8a0f6913
Reviewed-on: https://gerrit.instructure.com/34478
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2014-05-07 19:41:06 +00:00
Stanley Stuart f3b9511d71 allow the quiz submission users endpoint to sideload quiz submissions
Test plan:
  - As a teacher in a course, create a quiz.
  - Have some students take the quiz, and some students not take the
    quiz.
  - Query
    '/api/v1/courses/:course_id/quizzes/:quiz_id/submission_users?include[]=quiz_submissions'
  - You should see quiz submission data in "quiz_submissions" in the
    json root with the quiz submissions for each user.

fixes CNVS-12896

Change-Id: Ia5ca15c07c97c009267fc52dcd02c61355fcfd2f
Reviewed-on: https://gerrit.instructure.com/34422
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2014-05-07 19:31:12 +00:00
James Williams 50bead3e73 don't unset front page settings on course copy/import
test plan:
* create a course with wiki pages
* set one of them as the front page

* create another course and copy it into the first course,
* the front page in the original course should stay the same
 as before

* unset the front page
* now copy or import a course package that has a front page
* the new page should become a front page

fixes #CNVS-12137

Change-Id: I91b70ce32cb3bacd5e42d161019b304eca3586bd
Reviewed-on: https://gerrit.instructure.com/34328
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-05-07 17:12:09 +00:00
James Williams 68fb8d952c fix importing of unpublished quiz assignments
test plan:
* import the package referenced in the ticket
* there should be a "Quiz Assignment"
* the link on the wiki front page to the "Quiz Assignment"
 should work

fixes #CNVS-12815

Change-Id: Id4c779da199610783bfd339468532853ebd948bf
Reviewed-on: https://gerrit.instructure.com/34197
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-05-07 17:11:59 +00:00
Ethan Vizitei e19715568f Add accessibility for Announcements RSS
fixes: CNVS-12849

Without some kind of label for this
announcements RSS link, it does not
say anything but "visited link" when
a screenreader scans it.  This adds a hidden label
so that the screenreader can say "RSS Feed".

Test Plan:
  - Login as any user with a course
  - Visit the Announcements page for a course
  - Enable your screenreader and tab through to RSS Feed
  - You should hear "link: RSS Feed"

Change-Id: I039cdd430141a28d53d04d11e6806b80eb961ebc
Reviewed-on: https://gerrit.instructure.com/34367
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Drew Bowman <dbowman@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Dana Danger <dana@instructure.com>
2014-05-07 16:58:11 +00:00
Michael Ziwisky d97927281b improve navigation flow for custom dashboard_url, fixes CAT-163
test plan:
- in rails console:
-- a = Account.default
-- a.settings[:dashboard_url] = 'http://www.hackaday.com'
-- a.save
- go to canvas root url and log in
- notice that you're taken to the canvas dashboard
- notice that any dashboard links (e.g. the canvas logo at left end of
  header) point to your custom dashboard_url

Change-Id: I28bbbf6d39cace5d9203fadf60b245b83786c0e4
Reviewed-on: https://gerrit.instructure.com/34317
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Houle <nhoule@instructure.com>
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2014-05-07 15:44:12 +00:00
Anthus Williams 828981e72c define exportable attributes/associations on models
instead of passing an :exportable option to
ActiveRecord::Associations, simply define a constant
on the class containing exportable associations and
attributes. This is due to :exportable breaking
ActiveRecord, and we can't simply monkey-patch in
config/initializers because models are included in
migrations before the initializers are run

Change-Id: I11f1a6b4570c397d8e01010c517bc6efdac7afca
Reviewed-on: https://gerrit.instructure.com/33235
Reviewed-by: Braden Anderson <banderson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Anthus Williams <awilliams@instructure.com>
QA-Review: Anthus Williams <awilliams@instructure.com>
2014-05-06 23:54:24 +00:00
Jeremy Stanley 9aca437f5b include module_item_id parameter in draft state page redirect
fixes CNVS-12695

test plan:
 - enable draft state
 - add a wiki page to multiple modules
 - click a wiki page link on the modules page
 - the navigation footer should be present on the wiki page

Change-Id: I1e8c1540f40c97e77a289d1dab263dcd748c4475
Reviewed-on: https://gerrit.instructure.com/34300
Reviewed-by: Mark Severson <markse@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-05-06 23:45:24 +00:00
Mysti Sadler 8a63878c79 Update Wiki API docs to help users with brackets in API calls
Test Plan
- Wiki Page API docs should now show any params with brackets after a newline and -d

Change-Id: Iebd7fbb9d7d3dac5cfab0b7cc075d7c4330b8f62
Reviewed-on: https://gerrit.instructure.com/34203
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-05-06 22:01:35 +00:00
Tyler Pickett ad227cf0ee remove reference to missing plugins css package
fixes CNVS-12836

test plan:
- visit the plugins index

Change-Id: Ie37dbc5ef5f1f00860b9071c21ec49c5fc852d1c
Reviewed-on: https://gerrit.instructure.com/34261
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2014-05-06 21:43:23 +00:00
Cody Cutrer 9b11443ae2 add hooks to Api to find objects from other root accounts
refs CNVS-1180

Change-Id: Ic3e023e1869eefb75efedec028fb54f6fc995918
Reviewed-on: https://gerrit.instructure.com/31948
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-05-06 20:19:33 +00:00
James Williams 5e97e638a2 fix collapsed module title css
test plan:
* with draft state enabled, create a module
* collapse the module
* confirm that the title is not hidden

fixes #CNVS-12607

Change-Id: I06c6c884b3c5756d2a1f84b55df9dcedb784404d
Reviewed-on: https://gerrit.instructure.com/34386
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-05-06 19:49:31 +00:00
Stanley Stuart 78573749d9 quizzes ember show page: dropdown menu
implements some dropdown menu functionality on the quiz show page.

Test plan:
  In the quizzes dropdown menu on the show page:
  - Speedgrader link should take you to speedgrader
  - Lock/Unlock the quiz should work correctly
  - Delete should work correctly

closes CNVS-11792

Change-Id: Id71672f58111784fa1c321519f777e9ca605e46c
Reviewed-on: https://gerrit.instructure.com/30464
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2014-05-06 15:47:07 +00:00
Cody Cutrer af2af3a3f1 Merge pull request #443 from redconfetti/CLC-3511-gradebook-sections-export-canvas
Updated Gradebook to CSV export to include all section names
2014-05-06 09:39:10 -06:00
James Williams 2e87b4ff06 don't hard code course start_at and conclude_at times
test plan:
* should be able to set time with course start and end dates

* if setting the end date to midnight (the default if a time
is not set), confirm that a warning icon appears, explaining that
the day before the one they've set will be the last available day

fixes #CNVS-11851

Change-Id: I4403d0b9d964e49f598e0ad6b46844add4903fce
Reviewed-on: https://gerrit.instructure.com/34046
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-05-06 12:04:09 +00:00
Joseph Rodriguez 2d9cfc5ac4 moved Facebook code into gem
fixes: CNVS-12120

test plan:
- regression test facebook functionality

Change-Id: I041e726ee12f9eca8fc27ccdd049422073d1af15
Reviewed-on: https://gerrit.instructure.com/33595
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-05 22:32:15 +00:00
Joseph Rodriguez 02761bce6f pull canvas specific code out of Facebook class
fixes: CNVS-12520

test plan:
- regression test facebook functionality

Change-Id: I0016edccd3186e7d55146bf216ec2b07a369c801
Reviewed-on: https://gerrit.instructure.com/33531
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-05 22:32:07 +00:00
Eric Adams 1cba168aea add integration_id for section and course post to SIS APP
fixes SIS-237

TestPlan:
 - verify course has sections && Post Grades to SIS is enabled
 - verify course has integration_id
 - verify section has integration_id
 - go to Gradebook as Teacher in course
 - select All Sections in the SectionButton
 - Click Post Grades
 - ignore all errors
 - click post grades button
 - in javascript console, the url should contain:
   - if selected 'All Sections' - /grades/course/:integration_id
   - if one section selected - /grades/section/:integration_id

Change-Id: I9ffea143784ba8bd62889d8bd9e89b16ff8dc703
Reviewed-on: https://gerrit.instructure.com/33946
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Eric Adams <eadams@instructure.com>
Reviewed-by: Duane Johnson <duane@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
2014-05-05 21:40:54 +00:00
Josh Simpson 4e903f5fd1 add basic polling api
refs CNVS-12469
closes CNVS-12471,CNVS-12472,CNVS-12473
This commit adds basic CRUD API operations for polling.

Test plan
- Check the create/show/update/deletion API endpoints for both polls
and poll_choices

- Check access controls (students shouldn't be allowed to
  create/delete/update polls or poll choices, nor see the 'is_correct'
  attribute on poll_choices)

Change-Id: I05504bac9cce30382311b3beb6df826e6a30b77f
Reviewed-on: https://gerrit.instructure.com/33956
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2014-05-05 20:30:43 +00:00
Raphael Weiner a13f85e0ed move twitter to gem
fixes: CNVS-12492

test-plan:
* Test that all things Twitter related still work

Change-Id: Ib656c5bfcb2dc8490a6fa6f214b0f6dce25ad181
Reviewed-on: https://gerrit.instructure.com/33193
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-05 20:08:27 +00:00
Nathan Mills 8eeb4f5bf0 refactor twitter to not be a mixin
fixes: CNVS-12118

test-plan:
*twitter integration should work

Change-Id: I44a9011eb451aaa8eb196264bb4b65d1635da083
Reviewed-on: https://gerrit.instructure.com/33065
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-05 20:08:17 +00:00
Joel Hough 347321f3a5 cache 'everyone' search result in new conversations
fixes CNVS-12865

test plan
- as a teacher in new conversations, compose a new message
- select 'all in course' from the people picker drop down
- ensure that 'all in course' can be selected
- ensure that the message can be sent and is delivered to all
 users in the course

Change-Id: I6f2e0ad30ca2a09e52b4b5b764f3c21ecc0628f0
Reviewed-on: https://gerrit.instructure.com/34291
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-05-05 20:04:46 +00:00
James Williams 9159a4ada3 fix users admin merge autocomplete box
test plan:
* as an account admin, visit /users/:id/admin_merge
* the "Find a User" autocomplete box should work
 (note: the minimum search length is 4 characters)

fixes #CNVS-11476

Change-Id: I74095750a23085d63b814d80e40dacc62133ff7c
Reviewed-on: https://gerrit.instructure.com/34224
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-05-05 17:00:31 +00:00
Jason Madsen 584c76285c redirect from ember quiz stats when no permission
also better organize testing of permission redirection into a module

closes CNVS-12829

test plan:
  - enable fabulous quizzes
  - as an instructor
    - visit a quiz show page
      - verify that user can navigate through Overview, Moderate,
        Statistics tabs
  - as a student
    - visist a quiz show page
      - verify that users gets redirected to the Overview when navigating to Moderate or
        Statistics Tab
      - verify that redirect happens if user enters the correct url for
        moderate or statistics as well.

Change-Id: Ib87c42c53d9e53f224914cdab34d1781592a8512
Reviewed-on: https://gerrit.instructure.com/34256
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-05-05 16:55:04 +00:00
James Williams b9201e13f2 allow subaccount admins to move courses to other accounts
test plan:
* create a subaccount (the "parent" subaccount)
* create more children subaccounts within that parent subaccount
* create an account admin user for the parent subaccount
* create a course beloning to one of the children subaccounts

* as the account admin user, confirm that you can visit
 the course settings page and use the drop-down box to
 change the courses' account to any child account that
 belongs to the parent subaccount
* also confirm that the drop-down box does not show accounts
 outside the parent subaccount (even if they're on the same root
 account)

fixes #CNVS-10501

Change-Id: I1d7cae8a19b926cabb3473ba950d29ab08ad25ce
Reviewed-on: https://gerrit.instructure.com/34009
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-05-05 16:43:00 +00:00
Stanley Stuart cb67eb9899 fix submission html loading when file upload questions are present
Test plan:
  - As a teacher with fabulous quizzes, take a quiz with a file upload
    question. The submission detail view should load at the bottom of
    the overview tab.

fixes CNVS-12813

Change-Id: I40619c8a0b311787062c98d909189d1f7775d0ca
Reviewed-on: https://gerrit.instructure.com/34193
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2014-05-05 14:44:31 +00:00
Derek DeVries 1168ed5ab4 make show/moderate/statistics actions redirect to fabulous quizzes when enabled
fixes CNVS-12752, CNVS-12753, CNVS-12754

test plan:
  - turn fabulous quizzes off
  - visit an individual quiz with fabulous quizzes turned off
  - switch fabulous quizzes on
  - refresh the page
  - it should redirect to the overview tab on fabulous quizzes
  - the url should be something like: /courses/1/quizzes/fabulous_quizzes#/437

  - turn fabulous quizzes off
  - visit the quiz moderate page for a quiz with fabulous quizzes turned off
  - switch fabulous quizzes on
  - refresh the page
  - it should redirect to the moderate tab on fabulous quizzes
  - the url should be something like: /courses/1/quizzes/fabulous_quizzes#/437/moderate

  - turn fabulous quizzes off
  - visit the quiz statistics page for a quiz with fabulous quizzes turned off
  - switch fabulous quizzes on
  - refresh the page
  - it should redirect to the statistics tab on fabulous quizzes (which is
    currently an empty page)
  - the url should be something like: /courses/1/quizzes/fabulous_quizzes#/437/statistics

  - turn fabulous quizzes on
  - edit a quiz
  - when you save the quiz, it should redirect to the overview tab

  - try other variations which should bring you back to the show/moderate/stats
    pages. They should all bring you to the correct tabs on fabulous now

Change-Id: I85e8b628c0562d72c72a30e4e8340dd2cc0adcac
Reviewed-on: https://gerrit.instructure.com/34112
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-03 18:18:56 +00:00
James Williams 826a30500e fix observer link to student modal
test plan:
* create a course with at least one student
* create an observer
* through the cog menu, open the 'Link to Students' dialog

* click on the icon in the right-hand side of the search box
* should dropdown to reveal students in the course
 (rather than showing "No Results Found")
* pushing the down key with an empty list should not cause
 a javascript error

* also confirm that the "Link to Students" option does not
appear when the course is concluded

fixes #CNVS-4204 #CNVS-12820

Change-Id: I7666b89773841c061bd755318915df9540270775
Reviewed-on: https://gerrit.instructure.com/34219
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-05-03 13:15:55 +00:00
Dave Donahue 19c973ef4c course progress API fix for deleted/unpublished module items
fixes CNVS-12769
fixes CAT-157

Test plan:
  1. Create a module with a few module items and set up
     completion requirements for them. Also be sure to require
     sequential progress.
  2. Hit the course progress API for that course and verify
     that the next_requirement_url points to the first module
     item.
  3. Delete the first module item.
  4. Hit the API again and verify that the next_requirement_url
     points to the next module item, not the one that was deleted.

Change-Id: If77ed034f897507f45b15e623fdbe2c1c8ab9208
Reviewed-on: https://gerrit.instructure.com/34082
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2014-05-03 04:39:44 +00:00
Mark Severson 6761e9e2fc title editing on the wiki index page
test plan:
 - with draft state enabled
 * create several wiki pages
 * navigate to the index page (/courses/.../pages)
 * edit the title of one of the pages
   - the list of pages should not be duplicated

 - other wiki functionality should remain intact

fixes CNVS-11741

Change-Id: Iab1889671f9f706d8266df3051f660f6882995ca
Reviewed-on: https://gerrit.instructure.com/34216
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2014-05-02 21:52:33 +00:00
Nathan Mills bb244d1f86 move all DelayedJob Alert code into separate class
fixes CNVS-12411

test-plan:
regression test all alerts

Change-Id: Ie954c3c6c3f034fce130774c5c6e4e1515b02049
Reviewed-on: https://gerrit.instructure.com/33339
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:48:55 +00:00
Joseph Rodriguez 339dc7a41f Refactor alert creation to remove unnecessary code
fixes CNVS-12410

test plan:
regression test alert notifications

Change-Id: I3f20a532b0ee39ce2b9e136145f8c7f5f0bc0ba6
Reviewed-on: https://gerrit.instructure.com/33313
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:48:42 +00:00
Joseph Rodriguez 40dcaa4681 refactor Alert::UserNote to check enable_user_notes on account
fixes CNVS-12406

test plan
regression test alerts sent based on user notes and the enable user
notes accout setting

Change-Id: I9627c7db5381be282f6ed9134aee2f44fef76720
Reviewed-on: https://gerrit.instructure.com/33306
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:48:33 +00:00
Joseph Rodriguez 2533ddc54c extract interaction alert check to it's own class
fixes CNVS-12405

test plan:
regression test alerts sent out based on Submission Comments and
Conversation Messages

Change-Id: Ibd145fe07b7c23180bf855afa96c1d4e47459409
Reviewed-on: https://gerrit.instructure.com/33300
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:48:23 +00:00
Nathan Mills 99ef8ef712 extract user note alert check to it's own class
fixes CNVS-12402

    test-plan:
    regression check user note alerts for timespan threshold

Change-Id: I33abc799d7c34185aba15e62387eedee9b1acaf6
Reviewed-on: https://gerrit.instructure.com/33295
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:48:13 +00:00
Nathan Mills 1088ca732b extract ungraded timespan alert check to it's own class
fixes CNVS-12393

test-plan:
regression check ungraded submission alerts for timespan threshold

Change-Id: I228c2e152d20a61871a483974e5a418a9b61e56d
Reviewed-on: https://gerrit.instructure.com/33287
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:48:01 +00:00
Nathan Mills f3e4a898ba move ungraded count checking to it's own class
fixes CNVS-12392

test plan:
regression test on alerts for ungraded assignments

Change-Id: I0ee553666706e91a96b953b1796578b834fd88b7
Reviewed-on: https://gerrit.instructure.com/33284
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:47:41 +00:00
Nathan Mills 8002734889 extract student to teacher mapping
fixes CNVS-12370

test plan:
course alerts should still work

Change-Id: I877f27506e1c8f5c89de77c266018824b7f5045e
Reviewed-on: https://gerrit.instructure.com/33252
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:47:31 +00:00
Nathan Mills a891bdeca5 make evaluate_for_course arguments required
fixes CNVS-12343

test plan:
alerts for a course should still get sent

Change-Id: I149f72e5604c3d83a6a4aa63f2adcea5325ae9f5
Reviewed-on: https://gerrit.instructure.com/33220
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-02 21:47:22 +00:00
Jeremy Stanley 9690329ae4 include original_id with failed jobs
to make it easier to search logs.

note that the original_id is already returned in the
/jobs json; it just isn't displayed

test plan:
 - go to /jobs
 - pull down "Failed" under Jobs List
 - click a job
 - the job's original ID should be shown in the table
   under "Selected Job"

Change-Id: I7813779c51a1e36cc4c35975a38ebd0ad9165719
Reviewed-on: https://gerrit.instructure.com/34205
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-05-02 20:35:12 +00:00
Jeremy Stanley c3da409dba remove namespace from CSS class for quiz module items
fixes CNVS-12357

test plan:
- test the following with draft state off and on:
 1. create a practice quiz and a graded quiz
 2. add both to a module. do not reload the page afterward!
  a. both quiz items should have a 'Q' icon, not a document icon.
  b. edit the module. you should be able to add completion
     requirements for both items.
   i.  both quizzes should be in the 'Quizzes' category in the
       Add Requirement list.
   ii. the correct requirement types should be selectable
       (e.g., everything except "contribute to the page")
 3. add both quizzes to another module
 4. reload the page and repeat step 2 against the new
    module created in step 3

note that this commit reverts g/32966 and re-fixes the bug
refs CNVS-12052

Change-Id: I81ce696320c95e9ed31cde164588a96eda6d7a19
Reviewed-on: https://gerrit.instructure.com/34096
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-05-02 20:34:42 +00:00
Jason Madsen f61634bd46 ember quiz stats tab does not add browser history
closes CNVS-12825

test plan:
  - emable fabulous quizzes
    - as an instructor navigate to quiz show
    - click on several tabs including Statistics
    - click browser back button
      - verify that you are on previous page (not previous tab)

Change-Id: I44a046a526aa8decf9e49b1118ab970fbc7d1a1f
Reviewed-on: https://gerrit.instructure.com/34238
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-05-02 20:18:00 +00:00
Stanley Stuart cbbe42a750 ember quizzes: sort quiz index page by dueAt then title
Test plan:
  - As a teacher, create a bunch of quizzes with different names and due
  dates.
  - They should sort by due date (if there's no due date, it should
    come before AFTER stuff with due dates), then by title.

closes CNVS-12432

Change-Id: I82d18577d0a18061a7853526a93990b202f7aa5f
Reviewed-on: https://gerrit.instructure.com/33963
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-02 20:15:47 +00:00
Jeff Belser 9073310d9c canvas help menu links are not being translated to current locale setting
fixes CNVS-5441

Test Plan
  1. Configure your default account to display the 'Help' link across
     the top identity navbar and footer areas
  2. Log in and navigate to a user's settings page: '/profile/settings'
  3. Click the 'Edit Settings' button and then select a new language
     preference from the dropdown. Select something other than english,
     and then click the 'Update Settings' button to confirm
  4. Across the header or footer of the page click the 'Help' link to open
     the modal
  5. Ensure the text displayed is rendered in your currently set
     language preference
  6. Repeat previous steps to confirm that the modal text updates properly
     after selecting a new language preference

Change-Id: I6423ee1598198cf7c21902d0acedd886cae6bfc3
Reviewed-on: https://gerrit.instructure.com/34142
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Michael Ziwisky <mziwisky@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2014-05-02 19:57:38 +00:00
Liz Abinante 662fcfe243 show module names on draft state assignment index
fixes CNVS-12216

test plan
- as a teacher
- in a course with 11+ modules
- with 1+ assignment in each module
- visit the assignment index page
- all module names should be listed (instead of 'Module')

Change-Id: I57b5f1219105e21db6fe48407422fc9385773bdf
Reviewed-on: https://gerrit.instructure.com/34083
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Product-Review: Liz Abinante <labinante@instructure.com>
2014-05-02 19:20:44 +00:00
Jason Madsen b6c585bd1c redirect non-permissioned users away from moderate
closes CNVS-12804

test plan:
  - enable fabulous quizzes
  - as an instructor
    - navigate to moderate tab on fabulous quizzes
      - moderate tab should display
  - as a student
    - navigate to moderate tab on fabulous quizzes
      - should be redirected (with a notice) back to fabulous quiz show

Change-Id: Ifc184195a5540724036975e86055bd3ea9745310
Reviewed-on: https://gerrit.instructure.com/34201
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-05-02 19:05:59 +00:00