Use apps versions to generate suffix when possible #7244
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skjnldsv
added
3. to review
Codecov Report
@@ Coverage Diff @@
## master #7244 +/- ##
============================================
- Coverage 50.97% 50.96% -0.01%
- Complexity 24735 24745 +10
============================================
Files 1586 1586
Lines 94257 94275 +18
Branches 1365 1365
============================================
+ Hits 48049 48050 +1
- Misses 46208 46225 +17
|
|
What I did:
@skjnldsv What did I wrong? |
|
@MorrisJobke It's the hash after the |
nickvergessen
previously requested changes
Nov 29, 2017
lib/private/TemplateLayout.php
Outdated
| // allows chrome workspace mapping in debug mode | ||
| return ""; | ||
| } | ||
| if ($app !== false && $app !== '') { | ||
| $v = \OC_App::getAppVersions(); | ||
| $appName = end(explode('/', $app)); |
There was a problem hiding this comment.
Also the explode looks like it wont work for apps/ next to server/ so where your $web is not straight forward?
lib/private/TemplateLayout.php
Outdated
| } | ||
| } | ||
| } | ||
|
|
||
| protected function getVersionHashSuffix() { | ||
| if(\OC::$server->getConfig()->getSystemValue('debug', false)) { | ||
| protected function getVersionHashSuffix($app=false) { |
|
All clear! Now we have nice and beautiful version suffixes! :) |
rullzer
previously requested changes
Dec 6, 2017
lib/private/TemplateLayout.php
Outdated
| } | ||
| return end($pathParts); | ||
| } | ||
|
|
There was a problem hiding this comment.
Don't lie in your phpdoc 😉 If you say you returning a string do so :P
MorrisJobke
reviewed
Dec 8, 2017
lib/private/TemplateLayout.php
Outdated
| * @param string $path | ||
| * @return string | ||
| */ | ||
| static public function getAppNamefromPath($path) { |
There was a problem hiding this comment.
Is there a reason why this is a static method? I guess the static can be dropped here.
|
@skjnldsv Could you address the comments? And then this can get in. |
skjnldsv
force-pushed
the
css-file-suffix-with-apps-versions
branch
from
4acc3f0 to
5958034
Compare
|
@MorrisJobke @rullzer all clear :) |
rullzer
approved these changes
Dec 11, 2017
MorrisJobke
requested changes
Dec 11, 2017
lib/private/TemplateLayout.php
Outdated
| } | ||
| return end($pathParts); | ||
| } | ||
| return false |
There was a problem hiding this comment.
Syntax error: Missing ; 😉 Let me push a fix for this
There was a problem hiding this comment.
I was sure I pushed a fix for this! :O
MorrisJobke
approved these changes
Dec 11, 2017
MorrisJobke
added
the
4. to release
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: Morris Jobke <hey@morrisjobke.de>
MorrisJobke
force-pushed
the
css-file-suffix-with-apps-versions
branch
from
759bff6 to
52e7d05
Compare
|
Rebased to fix the failing integration test, that was fixed on master. |
I was wrong - it was not yet merged to master -> CI looks good so far -> merging. |
|
Of course I have overlooked one issue in the setup integration tests because of the other one. Let me fix this. |
Merged
#7449 <- that then also should be backported together with this PR. |
|
@skjnldsv please prepare the backport |
|
@skjnldsv I guess this backport didn't made it yet, right? |
|
Oups, my bad! |
|
I would like to wait for 12.0.6 for this, is this okay? |
|
Okay for me |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will force css cache update on the user's browser side on app update. And avoid many errors like calendar or contacts had in the past.