298e6808d5
fixes: CNVS-24787
fixes: CNVS-23964
fixes: CNVS-23957 - Handle parent account custom css/js for new_styles
test plan:
* set up a root account, child account, and grandchild account
* use theme editor to set a custom css/js file for each
(eg: for css `* {color:red}` and for js 'console.log("from grandchild")`
* make a course & a group in the grandchild account
* load a page in that course and group and make sure
you see grandchild account's branding, and root's,
child's, and then grandchild's css loaded on the page
(grandchild should be loaded last so you see it's css
effects override root or child's and you should see
the console.log from root then child then grandchild)
* view a page in "child". it should have root and child's
css/js but not grandchild
* as a user that only has enrollments (account associations)
in "child", go to the dashboard. you should see
css/js for both root and child but not grandchild
fixes: CNVS-25051 Opening Theme Editor for
sub-accounts shows incorrect theme preview
test plan:
* Go to a sub-account in theme editor and change
settings so the Branding is different and save.
* the preview on the right should reflect your
changes both after you "apply" and "save"
(and not just show the preview of the root
account's branding)
fixes: CNVS-23406 - global JS and CSS files are being
included when Global CSS/JavaScript includes is false
test plan:
* go to /accounts/self/, and go to theme editor and
upload a css_override
* see that that css is loaded on pages
* back in root account settings disable Global
CSS/JavaScript includes
* check that the css is no longer loaded.
* do the same thing checking a subaccount's custom css
fixes: CNVS-25558 - load whole chain of custom css/js
in native app api requests
test plan:
* make api request for a wiki page in course in a
subaccount that has custom css/js within a root
account that also has custom css/js
* you should see both the root account's css/js and
the child account's returned in the response
to test grandchild js issue jeremyp found:
* go to theme editor for a grandchild account
* choose a js override file (like: `console.log('first')`)
* preview & apply
* you should see "first" in console
* go back to theme editor, pick a new file (like: `console.log('second')`)
* preview & apply
* you should only see "second" in console. not "first"
Change-Id: I8d9047948f5da94be41e0205844629a170f980af
Reviewed-on: https://gerrit.instructure.com/68249
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
|
||
|---|---|---|
| .. | ||
| content.rb | ||
| link.rb | ||
| media_tag.rb | ||
| url_proxy.rb | ||