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

feat(systemtags): add color support #49295

Merged
merged 7 commits into from
Dec 6, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(systemtags): handle null dav value
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
  • Loading branch information
skjnldsv committed Dec 6, 2024
commit 885b692f9a22a4b40832522a40514e9914b29426
6 changes: 5 additions & 1 deletion apps/dav/lib/SystemTag/SystemTagPlugin.php
Original file line number Diff line number Diff line change
@@ -443,7 +443,11 @@ public function handleUpdateProperties($path, PropPatch $propPatch) {
}

if (isset($props[self::COLOR_PROPERTYNAME])) {
$color = $props[self::COLOR_PROPERTYNAME];
$propValue = $props[self::COLOR_PROPERTYNAME];
if ($propValue === '' || $propValue === 'null') {
$propValue = null;
}
$color = $propValue;
$updateTag = true;
}

2 changes: 1 addition & 1 deletion apps/systemtags/src/services/api.ts
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ export const updateTag = async (tag: TagWithId): Promise<void> => {
<oc:display-name>${tag.displayName}</oc:display-name>
<oc:user-visible>${tag.userVisible}</oc:user-visible>
<oc:user-assignable>${tag.userAssignable}</oc:user-assignable>
<nc:color>${tag.color}</nc:color>
<nc:color>${tag?.color || null}</nc:color>
</d:prop>
</d:set>
</d:propertyupdate>`
2 changes: 1 addition & 1 deletion dist/files-sidebar.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/systemtags-admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/systemtags-admin.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/systemtags-init.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/systemtags-init.js.map

Large diffs are not rendered by default.

Loading