diff options
| author | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
|---|---|---|
| committer | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
| commit | 9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch) | |
| tree | 47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /client/components/activities | |
| parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
| parent | 8b16955cc27b29ae507be084adccc4fad61b05ef (diff) | |
| download | wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2 wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip | |
resolving merge conflicts
Diffstat (limited to 'client/components/activities')
| -rw-r--r-- | client/components/activities/activities.jade | 3 | ||||
| -rw-r--r-- | client/components/activities/activities.js | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 2054777a..d3e3d5ba 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -53,6 +53,9 @@ template(name="boardActivities") if($eq activityType 'createCard') | {{{_ 'activity-added' cardLink boardLabel}}}. + if($eq activityType 'createCustomField') + | {{_ 'activity-customfield-created' customField}}. + if($eq activityType 'createList') | {{_ 'activity-added' list.title boardLabel}}. diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index ccb064f3..95699961 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -91,6 +91,11 @@ BlazeComponent.extendComponent({ }, attachment.name())); }, + customField() { + const customField = this.currentData().customField(); + return customField.name; + }, + events() { return [{ // XXX We should use Popup.afterConfirmation here |