fix(systemtags): unify restrict_creation_to_admin handling#51288

Merged

skjnldsv merged 3 commits intomasterfrom

fix/admin-tag-color-prevent

Mar 6, 2025

Member

skjnldsv commented Mar 5, 2025 •

edited

Loading

Fix #51233
Fix #51247

Properly allow bulk tagging if tag restriction is active, only prevent creation and color update
Added Bulk tagging cypress checks for this use case
Properly check restriction in dav plugin
Adjusted the differences between default (false) and value handling as bool (previously string)

skjnldsv requested review from a team as code owners

March 5, 2025 16:05

skjnldsv requested review from artonge, nfebe and sorbaugh and removed request for a team

March 5, 2025 16:05

skjnldsv self-assigned this

skjnldsv added bug 3. to review feature: dav feature: tags labels

skjnldsv force-pushed the fix/admin-tag-color-prevent branch 2 times, most recently from 9f77664 to e41d716 Compare

March 5, 2025 16:16

susnux reviewed

View reviewed changes

apps/systemtags/src/components/SystemTagPicker.vue Outdated Show resolved Hide resolved

susnux reviewed

View reviewed changes

apps/systemtags/src/components/SystemTagPicker.vue Show resolved Hide resolved

susnux reviewed

View reviewed changes

apps/systemtags/src/components/SystemTags.vue Show resolved Hide resolved

susnux reviewed

View reviewed changes

apps/systemtags/src/components/SystemTagsCreationControl.vue Outdated Show resolved Hide resolved

susnux reviewed

View reviewed changes

apps/systemtags/src/components/SystemTagsCreationControl.vue Outdated Show resolved Hide resolved

susnux reviewed

View reviewed changes

lib/private/SystemTag/SystemTagManager.php Outdated Show resolved Hide resolved

susnux reviewed

View reviewed changes

lib/public/SystemTag/ISystemTagManager.php Show resolved Hide resolved

susnux reviewed

View reviewed changes

lib/public/SystemTag/TagUpdateForbiddenException.php Outdated

+              declare(strict_types=1);
+              /**
+               * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors

Contributor

susnux Mar 5, 2025

Suggested change

      
             * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
          
             * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors

Member Author

skjnldsv Mar 6, 2025

susnux reviewed

View reviewed changes

lib/public/SystemTag/TagUpdateForbiddenException.php Outdated Show resolved Hide resolved

Contributor

susnux commented Mar 5, 2025

@skjnldsv also fixed #51247 ?

Member Author

skjnldsv commented Mar 5, 2025

@skjnldsv also fixed #51247 ?

It should yes 👍

Altahrim reviewed

View reviewed changes

Collaborator

Altahrim left a comment

PHP part looks good :) Thanks!

lib/private/SystemTag/SystemTagManager.php Outdated Show resolved Hide resolved


          fix(systemtags): unify restrict_creation_to_admin handling

29405f0

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

skjnldsv force-pushed the fix/admin-tag-color-prevent branch from 0e45f58 to ab14373 Compare

March 6, 2025 10:31


          fix(systemtags): prevent tag edition if restricted

4c0c88a

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

skjnldsv force-pushed the fix/admin-tag-color-prevent branch from ab14373 to 6648109 Compare

March 6, 2025 11:05

skjnldsv requested a review from susnux

March 6, 2025 11:05

skjnldsv requested a review from Altahrim

March 6, 2025 11:05

Member Author

skjnldsv commented Mar 6, 2025

/compile amend /


          chore(assets): compile assets

ad7afc6

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

nextcloud-command force-pushed the fix/admin-tag-color-prevent branch from 6648109 to ad7afc6 Compare

March 6, 2025 11:11

Member Author

skjnldsv commented Mar 6, 2025

All addressed

susnux approved these changes

View reviewed changes

skjnldsv enabled auto-merge

March 6, 2025 12:26

Altahrim approved these changes

View reviewed changes

skjnldsv merged commit b44f156 into master

190 checks passed

skjnldsv deleted the fix/admin-tag-color-prevent branch

March 6, 2025 13:09

Member Author

skjnldsv commented Mar 6, 2025

/backport to stable31

backportbot bot added the backport-request label

backportbot bot mentioned this pull request

[stable31] fix(systemtags): unify restrict_creation_to_admin handling #51308

Merged

2 tasks

backportbot bot removed the backport-request label

skjnldsv mentioned this pull request

Be able to disable tags for new files #50469

Closed

nextcloud-bot mentioned this pull request

32.0.0 beta 1 #54502

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

susnux susnux approved these changes

Altahrim Altahrim approved these changes

artonge Awaiting requested review from artonge artonge is a code owner automatically assigned from nextcloud/server-frontend

nfebe Awaiting requested review from nfebe nfebe is a code owner automatically assigned from nextcloud/server-frontend

sorbaugh Awaiting requested review from sorbaugh sorbaugh is a code owner automatically assigned from nextcloud/server-frontend

Labels

3. to review bug feature: dav feature: tags