diff options
| author | Andrés Manelli <andresmanelli@gmail.com> | 2018-04-17 01:55:57 -0300 |
|---|---|---|
| committer | Andrés Manelli <andresmanelli@gmail.com> | 2018-08-10 23:59:08 +0200 |
| commit | 0a62089df02b2ab308d4749a837e08c4164cb770 (patch) | |
| tree | 7a8ff38e2074e3568d99f5202893d32398d6fb76 /client/components/cards | |
| parent | a93de07fb9b85f97da274bf549e5244ee8e30484 (diff) | |
| download | wekan-0a62089df02b2ab308d4749a837e08c4164cb770.tar.gz wekan-0a62089df02b2ab308d4749a837e08c4164cb770.tar.bz2 wekan-0a62089df02b2ab308d4749a837e08c4164cb770.zip | |
Allow description and member two way binding
Diffstat (limited to 'client/components/cards')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 8 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.js | 5 | ||||
| -rw-r--r-- | client/components/cards/minicard.jade | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 3d0bfb98..64ce7f66 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -55,7 +55,7 @@ template(name="cardDetails") .card-details-items .card-details-item.card-details-item-members h3.card-details-item-title {{_ 'members'}} - each members + each getMembers +userAvatar(userId=this cardId=../_id) | {{! XXX Hack to hide syntaxic coloration /// }} if canModifyCard @@ -92,15 +92,15 @@ template(name="cardDetails") h3.card-details-item-title {{_ 'description'}} +inlinedCardDescription(classNames="card-description js-card-description") +editor(autofocus=true) - | {{getUnsavedValue 'cardDescription' _id description}} + | {{getUnsavedValue 'cardDescription' _id getDescription}} .edit-controls.clearfix button.primary(type="submit") {{_ 'save'}} a.fa.fa-times-thin.js-close-inlined-form else a.js-open-inlined-form - if description + if getDescription +viewer - = description + = getDescription else | {{_ 'edit'}} if (hasUnsavedValue 'cardDescription' _id) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 181fea1b..2cd399c1 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -43,8 +43,7 @@ BlazeComponent.extendComponent({ }, canModifyCard() { - return Meteor.user() && Meteor.user().isBoardMember() && - !Meteor.user().isCommentOnly() && !this.currentData().isImported(); + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); }, scrollParentContainer() { @@ -275,7 +274,7 @@ BlazeComponent.extendComponent({ close(isReset = false) { if (this.isOpen.get() && !isReset) { const draft = this.getValue().trim(); - if (draft !== Cards.findOne(Session.get('currentCard')).description) { + if (draft !== Cards.findOne(Session.get('currentCard')).getDescription()) { UnsavedEdits.set(this._getUnsavedEditKey(), this.getValue()); } } diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 7e2999d3..00120882 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -57,9 +57,9 @@ template(name="minicard") +viewer = trueValue - if members + if getMembers .minicard-members.js-minicard-members - each members + each getMembers +userAvatar(userId=this) .badges |