Skip to content

Commit

Permalink
fix subname (manual backport #3777)
Browse files Browse the repository at this point in the history
Signed-off-by: dartcafe <github@dartcafe.de>
  • Loading branch information
dartcafe committed Dec 15, 2024
1 parent 19b6aca commit 9237b48
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions lib/Model/UserBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function getLocaleCode(): string {

return $this->localeCode;
}

public function getTimeZone(): DateTimeZone {
if ($this->timeZoneName) {
return new DateTimeZone($this->timeZoneName);
Expand Down Expand Up @@ -304,7 +304,7 @@ public function getRichUserArray(): array {
'userId' => $this->getId(),
'displayName' => $this->getDisplayName(),
'emailAddress' => $this->getEmailAddress(),
'subName' => $this->getSubName(),
'subname' => $this->getSubName(),
'subtitle' => $this->getDescription(),
'isNoUser' => $this->getIsNoUser(),
'desc' => $this->getDescription(),
Expand Down Expand Up @@ -334,7 +334,7 @@ protected function getSimpleUserArray(): array {
'emailAddress' => $this->getSafeEmailAddress(),
'isNoUser' => $this->getIsNoUser(),
'type' => $this->getSafeType(),
'subName' => null,
'subname' => null,
'subtitle' => null,
'desc' => null,
'organisation' => null,
Expand Down
3 changes: 2 additions & 1 deletion src/components/User/UserSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}, 250)

async function clickAdd(user: User) {
Logger.debug('Adding share clicAdd', user)
Logger.debug('Adding share clicAdd', user)
try {
await sharesStore.add(user)
} catch {
Expand All @@ -60,6 +60,7 @@
:tag-width="80"
:limit="30"
:loading="isLoading"
:filterable="false"
:searchable="true"
:placeholder="placeholder"
:close-on-select="false"
Expand Down

0 comments on commit 9237b48

Please sign in to comment.