when a teacher tries to set the default grade to 'EX',
'ex', 'Ex', or 'eX', an error message will flash and grades
will not be changed.
closes CNVS-21897
test plan:
1. In Gradebook, under the assignment header menu, select
Set Default Grade.
2. Enter 'EX', 'ex', 'Ex', or 'eX' as the grade (you can
select the overwrite option if you want, it shouldn't matter)
3. Verify a message alerts the user that the default grade
cannot be set to 'EX'
4. Go back to the gradebook and verify all grades for the
assignment are unchanged.
Change-Id: I9f2178ef28739c55fe19aec1ca2d178fbdd99ed0
Reviewed-on: https://gerrit.instructure.com/58526
Tested-by: Jenkins
Product-Review: Spencer Olson <solson@instructure.com>
Reviewed-by: Cody Poll <cpoll@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
closes: CNVS-21899
In the theme editor, when you set, for example,
"brand-primary" to red, a bunch of other inputs
inherit that same color as their default value.
to show that the value is inherited, we show the
red color as the color picker swatch and we also
set the placeholder of the input to "red"
it was confusing because with this custom placeholder
styling, you couldn't tell if you had explicitly
set the second value or if it was just like that
because you had set the brand-primary value
that it inherits from.
when I git blamed these lines, they were from my
big commit so I don't know if it was something
that I accidentally added or if it was intended
Change-Id: I2b6dc2c53903b6471b07e78529563da9a0be6275
Reviewed-on: https://gerrit.instructure.com/58313
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins
QA-Review: Nathan Rogowski <nathan@instructure.com>
fixes CNVS-21865
Test Plan:
* Enable Module Progression "OR" Feature Flag
* Create a module with requirements where ALL
have to be met to be marked as completed
* As a student enrolled in that classs with those
modules, the newly created module should not be
marked as completed
Change-Id: I37c3e376e3026d66ec93c36e9473ba7fb3316894
Reviewed-on: https://gerrit.instructure.com/58340
Tested-by: Jenkins
Reviewed-by: Brock Cooper <bcooper@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
should improve performance when viewing as a course admin
test plan:
* modules index should work as before
refs #CNVS-21476 #CNVS-21317
Change-Id: I00ee7602a48bc78538e8034d562781059f6fabb8
Reviewed-on: https://gerrit.instructure.com/57276
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
refs #CNVS-21596
Change-Id: I4d19b4f142b443109f15e4c658495a459867159d
Reviewed-on: https://gerrit.instructure.com/58382
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
closes: CNVS-21701 CNVS-21846
test plan.
* open theme editor and set just the "brand-primary" color.
* hit preview
* the background of the "global nav" on the left of
the page should be the color you set as brand-primary
Change-Id: I4781187db7543c31b71b25e414f8da6b3cda3578
Reviewed-on: https://gerrit.instructure.com/58310
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
when the gradebook is rerendered via slickgrid
the events in the column header that are attached
to the menu dropdown are removed. to fix this
we call @fixColumnReordering(), which reattaches
the events. this bug occured because when we
change the editability of an assignment, slickgrid
re renders. the menu also didn't show up after reordering
the secondary id / student name columns.
fixes CNVS-21599
test plan
- login as a teacher into a gradebook with
multiple grading periods
- click a dropdown in an assignment column header
- ensure the dropdown works
Change-Id: I8df6c6bf55dcf91fd78c7e59aff49035b117284f
Reviewed-on: https://gerrit.instructure.com/58515
Tested-by: Jenkins
Reviewed-by: Cody Poll <cpoll@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
Product-Review: Dylan Ross <dross@instructure.com>
fixes CNVS-21857
brandable_css was logging warnings for these image and font urls.
This seems to fix that.
Note there are still a couple warnings for images that actually
don't exist in the repo:
1. /images/inst_tree/node-drag.gif
(referenced at _inst_tree.scss:97)
2. /images/mediaelement/skipback.png
(referenced at _mediaelementplayer.scss:977)
Changes included in this commit:
1. canvas-icons svg font url
(verify at /styleguide#icons)
2. breadcrumbs arrow image url
(verify that there are no changes to breadcrumbs)
3. loader image in new ui navigation trays
(click 'Admin' or 'Courses' in new nav with a slow connection)
Change-Id: Ic077717dd20a552e4a3fd28d3dd4f5873f3c926e
Reviewed-on: https://gerrit.instructure.com/58291
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
use :view_unpublished_items rather than :manage_content or
:update, so teachers can still view unpublished content
(in a read-only state) after a course is concluded
test plan:
- ensure unpublished modules and module items in
a concluded course are visible to a teacher in that course
- ensure the module items can be clicked on, and lead to
the appropriate content (page, assignment, discussion)
instead of an error message
fixes CNVS-21529
Change-Id: I01999a13d9d450b08ed8238608238de25a641d25
Reviewed-on: https://gerrit.instructure.com/57803
Tested-by: Jenkins
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
fixes CNVS-21714
test plan:
* go to /api/v1/users/sis_user_id:theusersisid
* it should not give a 404 (assuming you're logged in as an admin,
and the id is valid)
Change-Id: I0901f5c60941c1b3d27aa3a699c3bed20b0850cd
Reviewed-on: https://gerrit.instructure.com/57746
Tested-by: Jenkins
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
refs #CNVS-21596
Change-Id: Ia82b978132eb127075c10ba0b79312c5bb2d1bf7
Reviewed-on: https://gerrit.instructure.com/57827
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
refs #CNVS-21596
Change-Id: I7888abfd6b36a7b685b6d89859d64bc1af72725e
Reviewed-on: https://gerrit.instructure.com/58387
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
refs #CNVS-21596
Change-Id: Iebebddf08a07df8504870609f9e7076af8d36b05
Reviewed-on: https://gerrit.instructure.com/58385
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
fixes: CNVS-21433
test plan:
* open theme editor
* make a change, hit preview,
* notice how colors look different for you now
* click "cancel changes" in the top left
* it should take you to whatever page was open in the
preview iframe
* you should not see the theme editor, and canvas
should use the colors it had before you opened
the theme editor
Change-Id: I47d4b1c736e3d7d4767151c1b17a3075ec822f07
Reviewed-on: https://gerrit.instructure.com/57559
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Ryan Shaw <ryan@instructure.com>
Test plan:
- pass Jenkins
- verify new spec's test_id and content matches that of its TestRail counterpart
Change-Id: If14ee93417549789a1f3113de495b72eee239a57
Reviewed-on: https://gerrit.instructure.com/58371
Reviewed-by: Adrian Foong <afoong@instructure.com>
Tested-by: Jenkins
Reviewed-by: Robert Lamb <rlamb@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
previously this did a linear table scan of discussion_topics,
causing very slow queries in large shards
test plan:
- re-run the test plan for commit 9ef2e79b (g/48210)
fixes CNVS-21753
Change-Id: Ic20d3ca33f723cf632402fd7508624df7ae77181
Reviewed-on: https://gerrit.instructure.com/58449
Tested-by: Jenkins
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
When a student has an in progress submission, only that submission is
returned from the quiz_submissions#index API endpoint. When there isn't
an in-progress quiz_submission, all completed submissions (including
previous attempts) are returned.
Closes CNVS-21848
Test Plan:
- Start a quiz
- Confirm that student can get their quiz_submission in the
quiz_submissions#index API result.
- Complete the submission.
- Confirm that the completed version is returned at the API endpoint.
- Take it again.
- Confirm step 2, 3, and that both completed versions are returned
afterwards.
Change-Id: I25cbcc31f11c233431cbd4b77bfa18fc75aad8be
Reviewed-on: https://gerrit.instructure.com/58328
Tested-by: Jenkins
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Reviewed-by: Brian Finney <bfinney@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
Change-Id: I7fc2426b53b64abeb7a487d31f07f3eecbfbf60c
Reviewed-on: https://gerrit.instructure.com/58400
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
closes CNVS-21267
Test plan:
* excuse some assignments in a course
* download the gradebook
* excuse/unexcuse students in the gradebook
* upload the gradebook
Change-Id: I624f48415f0be524da70d0ea41ccd6216e06ed68
Reviewed-on: https://gerrit.instructure.com/57158
QA-Review: Adam Stone <astone@instructure.com>
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
This breaks importing in the case of a school seeking a re-import of
their outcomes.
Removing this should not be a problem. Since any changes to the outcome
are restricted in the controller, they still cannot be changed in the
API
Fixes CNVS-21830
Test Plan:
1. Assess an outcome.
2. Attempt to change the outcome's calculation method and
calculation int through the API. Observe that it does not allow you
to do that.
3. Now change the calculation method and calculation int in the rails
console, and observe that it does permit you to do so
Change-Id: I4a8440692fe7b3289040728e0500a41f3e237062
Reviewed-on: https://gerrit.instructure.com/58229
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Benjamin Porter <bporter@instructure.com>
fixes CNVS-21709
Test plan:
* Go to the gradebook
* Click on the upper right corner of any grade cell to open the
submission details dialog modal.
* In the modal, type "EX" in any case ("ex", "Ex", etc) and
click Update Grades
* Verify that the assignment is now marked as excused
Change-Id: Ic84beedcceb5894103a57e9d3287b63c66a6b698
Reviewed-on: https://gerrit.instructure.com/58461
Tested-by: Jenkins
Reviewed-by: Derek Bender <dbender@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
this patchset also shows users of srgb that an
assignment is excused.
fixes CNVS-21665
test plan
- log in as student
- view the assignments index page
- verify that an excused assignment is labeled
as 'Excused'
- verify accessibility
- log in as teacher
- switch to Screenreader Gradebook
- select a student from the dropdown
- select an assignment
- verify 'Excused' shows up next to the
grade selector if the assignment has
been excused
Change-Id: I3e01835a6d310b5fda605dd768c1719908a4879f
Reviewed-on: https://gerrit.instructure.com/58396
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: Robert Lamb <rlamb@instructure.com>
Product-Review: Dylan Ross <dross@instructure.com>
also revert "rails4: fix stale collection proxies"
refs #CNVS-21596
Change-Id: I7dd3d7d5e6ddb3c5fca17555b0e0ec347e6bfa75
Reviewed-on: https://gerrit.instructure.com/58381
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
closes CNVS-21458
refs CNVS-21080
Test plan:
* make a quiz
* excuse it for a student
* that student should not be able to take the quiz
Change-Id: I9b000fcbd2b59fbcd74a35642f66fe3f24234628
Reviewed-on: https://gerrit.instructure.com/57089
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
Change-Id: I97f29c3a08a5271b4ccf8554f34d437bcd1458f0
Reviewed-on: https://gerrit.instructure.com/58402
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
We had some leftover inline styles on the iframe for Theme Editor. These are
now in the CSS.
Test Plan:
- Load up New UI and go to Theme Editor
- the Preview area should still look the same (ie, reach full height of window)
fixes: CNVS-21841
Change-Id: I504fd1d065565fca6def634938951dc0bba73ca6
Reviewed-on: https://gerrit.instructure.com/58278
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Robert Lamb <rlamb@instructure.com>
testplan
- create a pass / fail assignment
- in srgb verify you can set the grade of the submission
to 'Excused'
closes CNVS-21867
Change-Id: I0a3b5b60156b191400317ef12b9ab03e7b54d903
Reviewed-on: https://gerrit.instructure.com/58349
Tested-by: Jenkins
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
teachers should not be able to set the default grade of
an assignment to excused.
test plan
- create a pass fail assignment
- verify the 'Excused' dropdown option is available
when viewing the submission details dialog
- click the column header of the assingment
you created
- select the 'Set default grade' option
- verify a teacher cannot set the default grade to
'Excused'
fixes CNVS-21462
Change-Id: I99674c232007889c35486655a824e8b4022f4b4f
Reviewed-on: https://gerrit.instructure.com/58339
Tested-by: Jenkins
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
closes CNVS-21065
This commit accounts for excused assignments in the grading history.
Now, if an assignment has been excused, the grading history will
report 'EX', as opposed to a blank value.
Test plan
- Check grading history for both graded assignments and
excused assignments.
- They should reflect prior behavior, except for excused assignments,
which should be shown as an "EX" value.
Change-Id: I8f8cc2f2f807414ae063e176fae301cb9a7ea19a
Reviewed-on: https://gerrit.instructure.com/58284
Tested-by: Jenkins
Reviewed-by: Derek Bender <dbender@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
Transifreq