since STI shares the same id space anyway
Change-Id: Ia140bcff857b73eb70fa95e622cf9ffe78f4f859
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340997
Reviewed-by: Isaac Moore <isaac.moore@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
allow multi-select filters to be combined into one pill and popover
and ensure that multi-select filters are saved on page refresh
closes EVAL-3828
closes EVAL-3829
flag=multiselect_gradebook_filters
test plan:
- enable site admin FF
- go to default gradebook for a course
- select two filters of the same type (i.e. late and missing)
- when the first one is selected, it should say the name of the
filter (i.e. "Late")
- upon selecting the second one, it should say the type of filter
and then in parentheses, the number of filters selected
- i.e. for late and missing, it should say "Status (2)"
- refresh the page
- ensure these two filters remained selected and the UI
looks the same
Change-Id: I28509fd10784029c2995a3f46edde15b3dd2ab60
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340753
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Christopher Soto <christopher.soto@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
Cluster's internal structure of Redis clients is quite different,
so we can't just throw disconnect_if_idle on there
fixes AE-751
Change-Id: Ie967460078061dbf3754210f40fa6bd189bf26da
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340996
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Isaac Moore <isaac.moore@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
This is to fix a failing test when upgrading to jquery 2.0. We
need to add a check to see if criterion_type is defined before
setting the option value. Otherwise, in jQuery 2.0 it won't
display the selected value for the assignment requirement
picker.
refs FOO-4258
flag=none
Test Plan:
- Jenkins passes
[skip-crystalball]
Change-Id: I5a3a002049974e314db8d0434c86a4dcb9012249
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340804
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
QA-Review: Angela Gomba <angela.gomba@instructure.com>
Product-Review: Angela Gomba <angela.gomba@instructure.com>
since the number of arguments changed for CacheStore#fetch
Change-Id: I1c4ed3241939b600c802f7657c71f85636cc1d7c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340994
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
why:
- To enable a set of "always_on" tools to always be present as a button
in the RCE hotbar, regardless of how many favorited tools an
institution has.
closes INTEROP-8435
flag=none
test-plan:
- Install the LTI 1.3 test tool in the editor_button placement
- Mark it as "always_on" using the following command:
Setting.set("rce_always_on_developer_key_ids", "<dev key id for the test tool>")
- Restart your Canvas so the setting takes effect.
- Rebuild the RCE code so this commit actually takes affect.
```
cd packages/canvas-rce
yarn build:all
```
- Navigate to any page with the RCE. The tool should appear in the
hotbar as favorited.
- Install two additional tools in the editor_button placement, such as
Xander's LTI 1.1 test tool, YALTT, or another version of the test
tool. Favorite both of these tools so they always show up in the RCE.
Note: You can install multiple versions of YALTT to the editor_button
placement. Make sure to name them differently so they get different
icons.
- Navigate to any page with the RCE. The always_on tool and the
favorited tools should all appear.
- Favorite the always_on tool then go back to the RCE. It should not
appear in the hotbar twice.
Change-Id: I52717443b05c8ae088c8a687c73e879ed553c910
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340552
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Paul Gray <paul.gray@instructure.com>
Reviewed-by: Xander Moffatt <xmoffatt@instructure.com>
QA-Review: Paul Gray <paul.gray@instructure.com>
Product-Review: Alexis Nast <alexis.nast@instructure.com>
closes LF-1175
flag=differentiated_modules
test plan:
- Change the browser language to English (Australia) and/or
Spanish.
- Navigate to an item "Assign To" tray.
- Select a date using a date/time picker.
> Verify that the date is using the respective format.
> Verify that this is not marked as invalid date.
> Verify that this and the other date pickers are working
as expected.
Change-Id: I2ea9caf84ddfad57227e05cd73a01d1c5eff1512
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340968
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jackson Howe <jackson.howe@instructure.com>
QA-Review: Jackson Howe <jackson.howe@instructure.com>
Product-Review: Juan Chavez <juan.chavez@instructure.com>
refs LF-1199
flag = none
Test plan:
- Make sure the deprecate_faculty_journal flag is disabled
- Go to the following pages and expect an alert to appear at the top
of the page indicating that FJ is deprecated on June 15:
- /accounts/:id/user_notes
- /courses/:id/user_notes
- /users/:id/user_notes
Change-Id: I4b57f7dead5d2a9960f1943a4da947c736e671bd
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340752
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Juan Chavez <juan.chavez@instructure.com>
QA-Review: Juan Chavez <juan.chavez@instructure.com>
Product-Review: Jackson Howe <jackson.howe@instructure.com>
refs VICE-3913
flag=none
Test Plan:
- Turn on SS view (not inline) or see spec
- Root entries should auto mark as read
-- unread counts update
- Sub entries should auto mark as read
Change-Id: I63dacd1ab46e7de818d24219dbade31279467268
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340721
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Gillett <jason.gillett@instructure.com>
Product-Review: Chawn Neal <chawn.neal@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
with jquery-migrate 1.4.1 on QUnit specs and on
runOnEveryPageButDontBlockAnythingElse.jsx
flag=none
refs FOO-4258
[skip-crystalball]
Change-Id: I46606a064237b79a7f9b608ce0e3a93ff8c386d4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340741
QA-Review: Jen Smith <jen.smith@instructure.com>
Product-Review: Jen Smith <jen.smith@instructure.com>
Reviewed-by: Angela Gomba <angela.gomba@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
fixes CAS-1728
flag=none
Test plan:
- Upload a document with the following types:
- odp;
- odt;
- ods;
- txt.
- The document should be sent to canvadocs correctly.
Change-Id: I5ce9dabce14e53e3d8b267d0c21d06ebd0084685
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340966
Reviewed-by: Keith Garner <kgarner@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Cameron Ray <cameron.ray@instructure.com>
fix course not populating in compose modal when messaging a student
from the user details page in course
fixes VICE-4005
flag=react_inbox
Test Plan:
1. go to the user details page for a student in a course
2. select 'send message' from the right side menu
3. confirm that once the compose modal appears, the course select is
populated with the course name
4. close the modal and press compose again
5. confirm that the course name is not populated in the course select
6. redo steps 1-3 but do not close the modal this time
7. Send the message and confirm that the student receives the message
in their inbox for that course
Change-Id: I7f1ad3ef5a686862e119faf55debe222c81261dd
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340902
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Omar Soto-Fortuño <omar.soto@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Samuel Lee <samuel.lee@instructure.com>
This is to fix a failing test when upgrading to
jquery 2.0.
refs FOO-4258
flag=none
Test Plan:
- Jenkins passes
[skip-crystalball]
Change-Id: I5bc73cf10342a769ece5d1d94d146487f5b84d10
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340803
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
QA-Review: Angela Gomba <angela.gomba@instructure.com>
Product-Review: Angela Gomba <angela.gomba@instructure.com>
closes LF-1285
flag=differentiated_modules
test plan:
- Open an "Assign To" item tray.
> Verify that the clear button is aligned to the date/time inputs.
> Verify that the clear button is aligned to the date/time inputs if
there is an error border.
- Make your screen to 767px or less.
> Verify that the clear button is aligned to the date input.
> Verify that the clear button is aligned to the date input if there
is an error border.
Change-Id: I5e81a26c2d35f096f9394994d35b1b1e287da5c3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340725
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Robin Kuss <rkuss@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Juan Chavez <juan.chavez@instructure.com>
closes EVAL-3827
flag=multiselect_gradebook_filters
Test Plan:
1. Enable the "Multi-select Gradebook Filters" SiteAdmin feature flag.
2. In a course with students in multiple groups, go to the Gradebook.
3. Verify you can select multiple groups when filtering by group, and
verify it filters students as expected.
4. Verify when all student group filters are removed that all students
are shown.
5. Apply multiple group filters and then refresh the page. Verify after
refresh that the filters are still active.
6. Disable the "Multi-select Gradebook Filters" SiteAdmin feature flag.
Verify you can no longer select multiple groups when filtering by group,
and verify it filters students as expected.
Change-Id: Icd18e699be5a17eed3ee22590b04414a2081b79e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340295
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
flag=react_inbox
closes VICE-4057
Test Plan
1. Create a course that is soft concluded
2. Have a section with a date override that extends past the course end
3. Verify that users in that section can
still send new messages
Change-Id: I9f95a57c4a45d47a92a183a72c71f1b274f69529
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340742
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Omar Soto-Fortuño <omar.soto@instructure.com>
Product-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Closes LF-1261
Test Plan:
1. Check all places where the Item Assign to Tray is available. In most
cases, the button should still be Save, but for Assignment
Create/Edit) , NQ Assignment local Edit, and Classic Quiz Create/Edit, the
button should say Apply.
Change-Id: I36872dafb3d29a118896d06413e2c95669a5ecfe
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340623
Reviewed-by: Jackson Howe <jackson.howe@instructure.com>
QA-Review: Jackson Howe <jackson.howe@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Robin Kuss <rkuss@instructure.com>
Closes FOO-4235
flag=none
Test plan:
* Recompile all assets including I18n
* Set your dev user language to "Bahasa Indonesia"
* Verify that most Canvas pages appear to be
translated in Indonesian
* Check the calendar for correct month/day names
and abbreviations
* Check the jQuery datepicker for correct month/
day names and abbreviations
* Also verify that the datepicker runs in 24-hour
time when in Indonesian
Change-Id: I9949f9e696d0aacd90d2880b17951ea8b49a7e87
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340869
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Charley Kline <ckline@instructure.com>
QA-Review: Charley Kline <ckline@instructure.com>
Product-Review: Charley Kline <ckline@instructure.com>
why:
* in some rare situation, the primary line item for an assignment
is not marked "coupled"
* instead query by the existing paradigm of "first-created line item"
* this will prevent the fixup for restoring deleted migrated
line items from erroring
refs INTEROP-8436
flag=none
test plan:
* specs
Change-Id: Ie55b715b8a69ce7e4fac6ebe5e18a0e6ba48ec43
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340887
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Tucker Mcknight <tmcknight@instructure.com>
Reviewed-by: Ryan Hawkins <ryan.hawkins@instructure.com>
QA-Review: Ryan Hawkins <ryan.hawkins@instructure.com>
Product-Review: Xander Moffatt <xmoffatt@instructure.com>
This task adds submitted_at, created_at, updated_at,
and attempt attributes to the rubric_assessed live
event body.
closes OUT-6174
flag=none
test plan:
- Tests are sufficient and Jenkins passes
Change-Id: I036b35b9710ae747d8fcf90d338dc5698a2df014
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340285
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Xander Moffatt <xmoffatt@instructure.com>
Reviewed-by: Dave Wenzlick <david.wenzlick@instructure.com>
QA-Review: Dave Wenzlick <david.wenzlick@instructure.com>
Product-Review: Chrystal Langston <chrystal.langston@instructure.com>
These are apparently hits to redis but happen for each LTI 1.3 tool on
every page that uses RCE (maybe more than that? anything that uses
ApplicationHelper#inst_env)
The editor button tools are cached, but it appears that
editor_button_json is called every time. The dev keys don't seem to be
pre-loaded in the cache, although in my tests it seems like they are
cached in redis. Still saving N (where N is the number of tools) redis
lookups and ActiveRecord object instantiations is worthwhile and
shouldn't make a difference unless a developer key is hard deleted (I
don't think we do that).
flag=none
refs INTEROP-8434
Test plan:
- (Same for git sha 87602829)
- Have a LTI 1.3 dev key with the editor placement and the tool
installed
- Setting.set("rce_always_on_developer_key_ids", key.global_id.to_s)
- Restart container if needed
- open a page with RCE
- open dev tools, INST.editorButtons should have always_on for the tool
Change-Id: I575b95d6b1e78b7ae177181e688950092471ebb8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340850
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Evan Battaglia <ebattaglia@instructure.com>
Product-Review: Evan Battaglia <ebattaglia@instructure.com>
Reviewed-by: Ryan Hawkins <ryan.hawkins@instructure.com>
This is to fix some of the failing tests when upgrading to
jquery 1.9.
refs FOO-4258
flag=none
Test Plan:
- Jenkins passes
[skip-crystalball]
Change-Id: Ic29100766bf8856a444688580a48744194c156b3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340799
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Angela Gomba <angela.gomba@instructure.com>
Product-Review: Angela Gomba <angela.gomba@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
This is to fix some of the failing tests when upgrading to
jquery 1.9. The fix is to move the set up outside of the
test module because setting up the event listeners on
the window between each test causes failures in
jQuery 1.9.
refs FOO-4258
flag=none
Test Plan:
- Jenkins passes
[skip-crystalball]
Change-Id: If8b9fce0e4a5bf38f86a0ed65cba4aa137afa3b9
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340800
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Angela Gomba <angela.gomba@instructure.com>
Product-Review: Angela Gomba <angela.gomba@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
flag=assignment_edit_placement_not_on_announcements
closes INTEROP-8430
why: The assignment_edit placement displays content on gradeable content
types (assignments, discussions, quizzes). It looks like it is currently
displaying on the create/edit announcement page and it should be removed.
test plan:
- create an announcement in a course
- with flag on, assignment_edit placement is not displayed (check
edit page as well)
- with flag off, assignment_edit placement is displayed (check
edit page as well)
Change-Id: Ie46b12f1cf93f2f27cf3b6ef220b940187298fd9
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340289
Reviewed-by: Xander Moffatt <xmoffatt@instructure.com>
QA-Review: Xander Moffatt <xmoffatt@instructure.com>
Product-Review: Alexis Nast <alexis.nast@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Previously, we were constructing this URL using some string
interpolation because the route didn't exist yet. It does now, so we
should stop string interpolating.
flag=lti_dynamic_registration
test-plan:
- The specs cover this
Change-Id: Ic9e215d5746dc990e6d1f5e69f77eadf1a10d2a9
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340310
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Xander Moffatt <xmoffatt@instructure.com>
QA-Review: Ryan Hawkins <ryan.hawkins@instructure.com>
Product-Review: Ryan Hawkins <ryan.hawkins@instructure.com>
This is to fix some of the failing tests when upgrading to
jquery 1.9.
refs FOO-4258
flag=none
Test Plan:
- Jenkins passes
[skip-crystalball]
Change-Id: I039fc78e7491bb2d83f98d375bb5432614170de7
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340797
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
QA-Review: Angela Gomba <angela.gomba@instructure.com>
Product-Review: Angela Gomba <angela.gomba@instructure.com>
to avoid accidentally updating it due to incompatibility with ratom-nokogiri
Change-Id: I80d8a2a50f80ae63fbf9a609e2a2ab7e5c176fbc
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340898
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
Aaron Shafovaloff