Skip to content

E
edx-platform
Switch branch/tag
  1. 21 Jul, 2016 1 commit
  3. 13 Jul, 2016 3 commits
    • Merge pull request #12986 from edx/PERF-351 · 71bebec5 
      Account for settings.STATIC_URL in XBlock resource URLs when rewriting them.
      Toby Lawrence committed
    • [PERF-351] Account for settings.STATIC_URL in XBlock resource URLs when · 8ab62b5b 
      rewriting them.

In PERF-341, we adjusted the static_replace middleware to try and
exclude static XBlock resource URLs from being interpreted as the marker
URLs used to signify course assets in course content.  Since they both
started with /static, this could, and did, cause issues where linking
directly to the assets of an XBlock within, say, one of its templates,
would lead to that link being rewritten and ultimately being incorrect.
The fix attempted to see if the link started with the prefix that all
static XBlock resource URLs start, and if so, it returned them
unmodified.

We incorrectly assumed that our testing captured all cases, and since
we're here, we know that this was wrong.  We weren't accounting for cases
when the URLs being generated had the STATIC_URL configuration value
prefixed -- https://example.com/static/xblock/.... -- and so our direct
check of seeing if such a URL started with "/static/xblock" would always
fail, leading to the erroneous rewriting and nonsensical output.

This fix checks if the link either starts with the prefix OR if it
starts with the STATIC_URL value and contains the prefix overall.  There
is a small overlap between the STATIC_URL and the prefix we check for,
so an inconsistency could arise down the line if we changed our
STATIC_URL to use a difference base directory, but our tests will at
least catch the issue now.
      Toby Lawrence committed
    • Merge pull request #12880 from caseylitton/up_logistration_toggle_footer_setting · 0332ebea 
      Add flag allow toggle logistration footer
      Douglas Hall committed
  5. 12 Jul, 2016 12 commits
  7. 11 Jul, 2016 16 commits
  9. 10 Jul, 2016 1 commit
    • [PERF-346] Add a second version component to versioned course asset URLs · f15533dc 
      This version component reflects the "version" of the StaticContent
objects which we cache server-side.  If the layout of those objects
changes between releases, errors occur when loading them from cache.

By using a separate version value, which can be incremented on its own
after a change has been made to the StaticContent class, we can avoid
loading older cached content and in turn take advantage of these changes
faster, without needing to intervene operationally.
      Toby Lawrence committed
  11. 09 Jul, 2016 1 commit
  13. 08 Jul, 2016 6 commits