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
merged 2 commits into from
Dec 31, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions apps/contactsinteraction/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<version>1.3.0</version>
<licence>agpl</licence>
<author>Christoph Wurst</author>
<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
<namespace>ContactsInteraction</namespace>
<types>
<dav/>
Expand Down
4 changes: 2 additions & 2 deletions apps/settings/js/vue-settings-apps-users-management.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/settings/js/vue-settings-apps-users-management.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions apps/settings/js/vue-settings-apps.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/js/vue-settings-apps.js.map
View file
Open in desktop

Large diffs are not rendered by default.

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