Skip to content

Fix scss webroot and url rewrite - #7631

Merged
MorrisJobke merged 8 commits into
masterfrom
fix-scss-webroot-and-url-rewrite
Jan 2, 2018
Merged

Fix scss webroot and url rewrite#7631
MorrisJobke merged 8 commits into
masterfrom
fix-scss-webroot-and-url-rewrite

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Dec 27, 2017

Copy link
Copy Markdown
Member

Fixes#7534
Also fixes the following situations:

  • Sub-directory nc installation
  • Sub-directory nc installation with a non-root app_path
  • Basic nc installation with a non-root path

➡️ Fix the massiv log spamming of not finding the webroot

TODO:

  • Testing

@codecov

codecovBot commented Dec 27, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7631 into master will increase coverage by 0.01%.
The diff coverage is 80%.

@@ Coverage Diff @@## master #7631 +/- ##
============================================
+ Coverage 51.17% 51.18% +0.01% - Complexity 24886 24889 +3 
============================================
Files 1602 1602 Lines 94752 94798 +46 Branches 1368 1368 ============================================
+ Hits 48486 48522 +36 - Misses 46266 46276 +10
Impacted FilesCoverage ΔComplexity Δ
lib/private/Template/CSSResourceLocator.php0% <0%> (ø)26 <0> (ø)⬇️
lib/private/Template/SCSSCacher.php71.09% <100%> (+1.25%)37 <3> (+1)⬆️
apps/dav/composer/composer/autoload_static.php0% <0%> (ø)2% <0%> (+1%)⬆️
core/templates/login.php0% <0%> (ø)0% <0%> (ø)⬇️
core/Controller/LoginController.php84.02% <0%> (+6.16%)39% <0%> (+1%)⬆️

@skjnldsv
skjnldsvforce-pushed the fix-scss-webroot-and-url-rewrite branch 4 times, most recently from 1d9da6c to 5a9d097CompareDecember 28, 2017 09:09
@rullzerrullzer added this to the Nextcloud 13 milestone Dec 28, 2017
@skjnldsv
skjnldsvforce-pushed the fix-scss-webroot-and-url-rewrite branch 16 times, most recently from e5bb608 to c732f56CompareDecember 29, 2017 06:37
@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 29, 2017
@skjnldsv

Copy link
Copy Markdown
MemberAuthor

Test finally fixed! :)
@LukasReschke you forgot to revert back the original WEBROOT in multiple tests, it's now fixed. I added you as reviewer for that 😉

@zauguin please test! 😃

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- With root installation
- Core css
- App inside server root
- Secondary apps directory outside server root
- With an installation in a sub directory
- Core css
- App inside server root
- Secondary apps directory outside server root
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the fix-scss-webroot-and-url-rewrite branch from c732f56 to c0c4443CompareDecember 30, 2017 04:56
@MorrisJobkeMorrisJobke mentioned this pull request Jan 2, 2018
30 tasks
@zauguin

Copy link
Copy Markdown

Works fine. Awesome👍

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works here 👍

@MorrisJobke
MorrisJobke merged commit aac9a1c into masterJan 2, 2018
@MorrisJobke
MorrisJobke deleted the fix-scss-webroot-and-url-rewrite branch January 2, 2018 14:03
@skjnldsv

Copy link
Copy Markdown
MemberAuthor

We need a backport imho :)
@karlitschek@MorrisJobke@rullzer

@MorrisJobke

Copy link
Copy Markdown
Member

@skjnldsv Do it ;)

@karlitschek

Copy link
Copy Markdown
Member

Backport is fine. Please note that this change has the potential to break in esoteric/non standard webserver setups. So good testing is important.

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

@karlitschek that's why I added tests with various installation instances to make sure it doesn't break. :)

Sign up for freeto 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.

13.0.0 Beta 3: Wrong paths in App CSS files with multiple app_paths

6 participants

@skjnldsv@zauguin@MorrisJobke@karlitschek@juliusknorr@rullzer