Fix various bugs

pull/4482/head
Denis Perov 3 years ago
parent 3071152978
commit 4277d89514
  1. 2
      .meteor/versions
  2. 6
      client/components/activities/activities.jade
  3. 7
      client/components/boards/boardBody.js
  4. 12
      client/components/lists/listBody.js
  5. 1
      models/cards.js
  6. 1
      server/publications/boards.js

@ -89,7 +89,7 @@ modern-browsers@0.1.7
modules@0.18.0
modules-runtime@0.12.0
momentjs:moment@2.29.1
mongo@1.14.1
mongo@1.14.5
mongo-decimal@0.1.2
mongo-dev-server@1.1.0
mongo-id@1.0.8

@ -42,7 +42,7 @@ template(name="addReactionPopup")
span.add-comment-reaction(data-codepoint="#{codepoint}") !{codepoint}
template(name="activity")
.activity
.activity(data-id=activity._id)
+userAvatar(userId=activity.user._id)
p.activity-desc
span.activity-member
@ -153,10 +153,10 @@ template(name="activity")
+editOrDeleteComment
if($eq activity.activityType 'deleteComment')
| {{{_ 'activity-deleteComment' currentData.commentId}}}.
| {{{_ 'activity-deleteComment' activity.commentId}}}.
if($eq activity.activityType 'editComment')
| {{{_ 'activity-editComment' currentData.commentId}}}.
| {{{_ 'activity-editComment' activity.commentId}}}.
else
//- if we are not in card mode we only display a summary of the comment
if($eq activity.activityType 'addComment')

@ -269,9 +269,10 @@ BlazeComponent.extendComponent({
openNewListForm() {
if (this.isViewSwimlanes()) {
this.childComponents('swimlane')[0]
.childComponents('addListAndSwimlaneForm')[0]
.open();
// The form had been removed in 416b17062e57f215206e93a85b02ef9eb1ab4902
// this.childComponents('swimlane')[0]
// .childComponents('addListAndSwimlaneForm')[0]
// .open();
} else if (this.isViewLists()) {
this.childComponents('listsGroup')[0]
.childComponents('addListForm')[0]

@ -43,7 +43,6 @@ BlazeComponent.extendComponent({
const position = this.currentData().position;
const title = textarea.val().trim();
const formComponent = this.childComponents('addCardForm')[0];
let sortIndex;
if (position === 'top') {
sortIndex = Utils.calculateIndex(null, firstCardDom).base;
@ -51,6 +50,7 @@ BlazeComponent.extendComponent({
sortIndex = Utils.calculateIndex(lastCardDom, null).base;
}
const formComponent = this.cardFormComponent();
const members = formComponent.members.get();
const labelIds = formComponent.labels.get();
const customFields = formComponent.customFields.get();
@ -132,6 +132,16 @@ BlazeComponent.extendComponent({
}
},
cardFormComponent() {
for (const inlinedForm of this.childComponents('inlinedForm')) {
const [addCardForm] = inlinedForm.childComponents('addCardForm');
if (addCardForm) {
return addCardForm;
}
}
return null;
},
scrollToBottom() {
const container = this.firstNode();
$(container).animate({

@ -5,6 +5,7 @@ import {
TYPE_LINKED_BOARD,
TYPE_LINKED_CARD,
} from '../config/const';
import Attachments from './attachments';
Cards = new Mongo.Collection('cards');

@ -5,6 +5,7 @@
import Users from "../../models/users";
import Org from "../../models/org";
import Team from "../../models/team";
import Attachments from '../../models/attachments';
Meteor.publish('boards', function() {
const userId = this.userId;

Loading…
Cancel
Save