summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorXavier Priour <xavier.priour@bubblyware.com>2015-10-14 19:54:40 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-10-14 23:23:16 +0200
commit7d57ce896baeac74498e8b76b5812ceb6df8b950 (patch)
treeb9ee501ebd7ea83dfe9ca98e7c4b5f34e0d1e16b /client
parent4b99ce2aa2ed94d54f677f94e410d2888aa3491f (diff)
downloadwekan-7d57ce896baeac74498e8b76b5812ceb6df8b950.tar.gz
wekan-7d57ce896baeac74498e8b76b5812ceb6df8b950.tar.bz2
wekan-7d57ce896baeac74498e8b76b5812ceb6df8b950.zip
Import single card: create an 'importCard' activity entry
Diffstat (limited to 'client')
-rw-r--r--client/components/activities/activities.jade5
-rw-r--r--client/components/activities/activities.js7
2 files changed, 12 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index 85b1276e..c611ad75 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -26,6 +26,9 @@ template(name="boardActivities")
if($eq activityType 'createCard')
| {{{_ 'activity-added' cardLink boardLabel}}}.
+ if($eq activityType 'importCard')
+ | {{{_ 'activity-imported' cardLink boardLabel sourceLink}}}.
+
if($eq activityType 'archivedCard')
| {{{_ 'activity-archived' cardLink}}}.
@@ -72,6 +75,8 @@ template(name="cardActivities")
+memberName(user=user)
if($eq activityType 'createCard')
| {{_ 'activity-added' cardLabel list.title}}.
+ if($eq activityType 'importCard')
+ | {{{_ 'activity-imported' cardLabel list.title sourceLink}}}.
if($eq activityType 'joinMember')
if($eq currentUser._id member._id)
| {{_ 'activity-joined' cardLabel}}.
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 9a1435ef..b80493f7 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -60,6 +60,13 @@ BlazeComponent.extendComponent({
}, card.title));
},
+ sourceLink() {
+ const source = this.currentData().source;
+ return source && Blaze.toHTML(HTML.A({
+ href: source.url,
+ }, source.system));
+ },
+
memberLink() {
return Blaze.toHTMLWithData(Template.memberName, {
user: this.currentData().member(),