Skip to content

[stable22] Fix rendering app authors with homepage or email #30432

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.

Sign up for GitHub

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

Merged
MichaIng merged 2 commits into from
Dec 31, 2021
Merged

[stable22] Fix rendering app authors with homepage or email #30432

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
345d02f
Fix rendering app authors with homepage or email
ChristophWurst Dec 27, 2021
25dd51c
Add the Groupware Team as contactsinteraction co-maintainer
ChristophWurst Dec 27, 2021
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
Next Next commit
Fix rendering app authors with homepage or email 
When the first author of an app doesn't have homepage/email attributes
set in info.xml then any further author was rendered as `[object
Object]` due to the complex XML node seralized to a JavaScript string.
The logic was fixed so that it converts any of the authors to simple
text.

Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst @backportbot
ChristophWurst authored and backportbot[bot] committed Dec 29, 2021
commit 345d02ff77303a3409f09b6db2828fb09c9cfe6c
18 changes: 12 additions & 6 deletions apps/settings/src/views/Apps.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,19 @@ export default {

// sidebar app binding
appSidebar() {
const authorName = (xmlNode) => {
if (xmlNode['@value']) {
// Complex node (with email or homepage attribute)
return xmlNode['@value']
}

// Simple text node
return xmlNode
}

const author = Array.isArray(this.app.author)
? this.app.author[0]['@value']
? this.app.author.map(author => author['@value']).join(', ')
: this.app.author.join(', ')
: this.app.author['@value']
? this.app.author['@value']
: this.app.author
? this.app.author.map(authorName).join(', ')
: authorName(this.app.author)
const license = t('settings', '{license}-licensed', { license: ('' + this.app.licence).toUpperCase() })

const subtitle = t('settings', 'by {author}\n{license}', { author, license })
Expand Down