Fixes for quota text in navigation bar #32993
Merged
Conversation
This file contains hidden or 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
"t()" escapes and sanitizes the returned text by default, so strings like "<" are converted to "<". However, the "jQuery.text()" parameter does not need to be escaped, as "<" is shown literally as "<" rather than "<". Now "jQuery.html()" is used instead, which "unescapes" the given text and sets it as a new text node (as the text in the parameter does not contain markup for elements, only text). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
The JavaScript code that updates the quota text expects the element to have "quotatext" as id. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Note that the quota may change too when files are moved if the file is moved, for example, to or from a folder shared by other user. Besides the quota the storage statistics are also updated, similar to what is done when a file is deleted. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
danxuliu
requested review from
a team,
PVince81,
artonge and
szaimen
and removed request for
a team
Member
Author
|
/backport to stable24 |
artonge
approved these changes
Jun 27, 2022
Pytal
approved these changes
Jun 27, 2022
Member
Author
|
/backport to stable23 |
Member
Author
|
/backport to stable22 |
This was referenced Jul 6, 2022
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 pull request fixes a regression introduced in f310b96 (not updating the usage on updates when no quota is set), as well as wrongly escaped text and not updating the quota when copying or moving files.
All issues were present already in Nextcloud 22. As it is a regression the fix will be backported to 22, 23 and 24.
How to reproduce (scenario 1)
Result with this pull request
The quota text in the navigation bar is updated and set to
< 1 KB of 1 GB usedResult without this pull request
The quota text in the navigation bar is updated and set to
< 1 KB of 1 GB usedHow to reproduce (scenario 2)
Result with this pull request
The quota text in the navigation bar is updated
Result without this pull request
The quota text in the navigation bar is not updated
How to reproduce (scenario 3)
Result with this pull request
The quota text in the navigation bar is updated
Result without this pull request
The quota text in the navigation bar is not updated
How to reproduce (scenario 4)
Result with this pull request
The quota text in the navigation bar is updated
Result without this pull request
The quota text in the navigation bar is not updated