Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.2.1] Do not try to override JS files from theme when there is no custom th… #35709

Merged
merged 1 commit into from
Jul 1, 2019

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented Jul 1, 2019

…eme active

Description

Backport of #35698

For the multi-appdir installation with no custom theme applied the apps app directory always wins while searching for the js resources
this contradicts the expectation that an appdir with the most recent application version should win

Related Issue

Motivation and Context

Outdated JS is loaded after update

How Has This Been Tested?

  1. Install 10.2.0+ with two app directories and non-writable apps (default installation)
  2. Update any app via market - the update will be installed into apps-external
  3. Use browser dev tools to monitor the origin of JS files for this app

Expected

script is loaded from apps-external

Actual

script is loaded from apps

Bonus

Enable a custom theme and put the same script into app-theme/apps/appid/js

Expected

Script is no longer loaded from apps-external but from the theme

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@patrickjahns patrickjahns modified the milestones: development, QA Jul 1, 2019
@patrickjahns patrickjahns merged commit 1b569af into release-10.2.1 Jul 1, 2019
@delete-merged-branch delete-merged-branch bot deleted the release-10.2.1-fix-35640 branch July 1, 2019 14:28
@davitol davitol mentioned this pull request Jul 2, 2019
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants