diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
| commit | 7a5f030cc807c6a0a5addd8da59dc853dd4bd426 (patch) | |
| tree | 784e5197277b8971eced858e1be9efb88b973cfd /client/components/activities/activities.js | |
| parent | f3fc154eb0cf25c46871510a0d4004037188ec15 (diff) | |
| parent | 118b434a5aad35df8eefea85624ab9abafab56f0 (diff) | |
| download | wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.gz wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.bz2 wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.zip | |
Merge branch 'xavierpriour-devel' into devel
Conflicts:
models/import.js
Diffstat (limited to 'client/components/activities/activities.js')
| -rw-r--r-- | client/components/activities/activities.js | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index b80493f7..b25c0ca8 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -60,11 +60,22 @@ BlazeComponent.extendComponent({ }, card.title)); }, + listLabel() { + return this.currentData().list().title; + }, + sourceLink() { const source = this.currentData().source; - return source && Blaze.toHTML(HTML.A({ - href: source.url, - }, source.system)); + if(source) { + if(source.url) { + return Blaze.toHTML(HTML.A({ + href: source.url, + }, source.system)); + } else { + return source.system; + } + } + return null; }, memberLink() { |