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

Fix quota links in files #541

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Fix quota links in files #541

merged 1 commit into from
Aug 30, 2023

Conversation

provokateurin
Copy link
Member

@provokateurin provokateurin commented Aug 21, 2023

Fixes #457
Fixes #173

This fix will only work for 28+ with the Files 2 Vue rewrite. Since there were no major complaints that this feature is broken I would skip backport to 26&27 because they require a completely different fix since they are still not in Vue.
Works on 25+

With this patch you even get the icons displayed in the quota and you can have more than one quota link (which wasn't prevented previously but it also didn't work either).

Signed-off-by: jld3103 <jld3103yt@gmail.com>
@provokateurin
Copy link
Member Author

Also works on 25-27 because the navigation was changed in 25 (as @skjnldsv suggested).

@provokateurin
Copy link
Member Author

/backport to stable25

@provokateurin
Copy link
Member Author

/backport to stable26

@provokateurin
Copy link
Member Author

/backport to stable27

@provokateurin provokateurin marked this pull request as ready for review August 30, 2023 07:20
Copy link
Member

@julien-nc julien-nc left a comment

Choose a reason for hiding this comment

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

LGTM
Tested locally
Code looks good even if the Files app html structure might change which would break this.

@provokateurin provokateurin merged commit c9c3f44 into master Aug 30, 2023
22 checks passed
@delete-merged-branch delete-merged-branch bot deleted the fix/quota-links branch August 30, 2023 09:56
@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

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.

Quota link feature broken in 26 Multiple quota links is broken again
3 participants