mirror of
https://github.com/wekan/wekan.git
synced 2026-01-30 21:25:17 +01:00
Allow description and member two way binding
This commit is contained in:
parent
a93de07fb9
commit
0a62089df0
6 changed files with 82 additions and 14 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -300,9 +300,10 @@ BlazeComponent.extendComponent({
|
|||
// Swimlane where to insert card
|
||||
const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
|
||||
this.swimlaneId = '';
|
||||
if (board.view === 'board-view-swimlanes')
|
||||
const boardView = Meteor.user().profile.boardView;
|
||||
if (boardView === 'board-view-swimlanes')
|
||||
this.swimlaneId = Blaze.getData(swimlane[0])._id;
|
||||
else
|
||||
else if (boardView === 'board-view-lists')
|
||||
this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
|
||||
},
|
||||
|
||||
|
|
@ -382,7 +383,6 @@ BlazeComponent.extendComponent({
|
|||
sort: Lists.findOne(this.listId).cards().count(),
|
||||
type: 'cardType-importedBoard',
|
||||
importedId: impBoardId,
|
||||
description: Boards.findOne({_id: impBoardId}).description,
|
||||
});
|
||||
Filter.addException(_id);
|
||||
Popup.close();
|
||||
|
|
|
|||
|
|
@ -134,8 +134,9 @@ BlazeComponent.extendComponent({
|
|||
|
||||
Template.cardMembersPopup.helpers({
|
||||
isCardMember() {
|
||||
const cardId = Template.parentData()._id;
|
||||
const cardMembers = Cards.findOne(cardId).members || [];
|
||||
const card = Template.parentData();
|
||||
const cardMembers = card.getMembers();
|
||||
|
||||
return _.contains(cardMembers, this.userId);
|
||||
},
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue