Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove hiding comments and activities.

Browse source
This commit is contained in:
Lauri Ojansivu 2020-02-10 17:25:27 +02:00
parent 6eac38bde5
commit 2a54218f3f
3 changed files with 214 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/activities/activities.jade
View file

@ -8,7 +8,6 @@ template(name="activities")
+cardActivities +cardActivities
template(name="boardActivities") template(name="boardActivities")
if currentBoard.allowsActivities
each currentBoard.activities each currentBoard.activities
.activity .activity
+userAvatar(userId=user._id) +userAvatar(userId=user._id)
@ -133,7 +132,6 @@ template(name="boardActivities")
span(title=createdAt).activity-meta {{ moment createdAt }} span(title=createdAt).activity-meta {{ moment createdAt }}
template(name="cardActivities") template(name="cardActivities")
if currentBoard.allowsComments
each currentCard.activities each currentCard.activities
.activity .activity
+userAvatar(userId=user._id) +userAvatar(userId=user._id)

1
client/components/cards/cardDetails.jade
View file

@ -261,7 +261,6 @@ template(name="cardDetails")
if currentUser.isBoardMember if currentUser.isBoardMember
unless currentUser.isNoComments unless currentUser.isNoComments
+commentForm +commentForm
if currentBoard.allowsActivities
unless currentUser.isNoComments unless currentUser.isNoComments
if isLoaded.get if isLoaded.get
if isLinkedCard if isLinkedCard

24
client/components/sidebar/sidebar.jade
View file

@ -147,18 +147,18 @@ template(name="boardCardSettingsPopup")
span span
i.fa.fa-paperclip i.fa.fa-paperclip
| {{_ 'attachments'}} | {{_ 'attachments'}}
div.check-div //div.check-div
a.flex.js-field-has-comments(class="{{#if allowsComments}}is-checked{{/if}}") // a.flex.js-field-has-comments(class="{{#if allowsComments}}is-checked{{/if}}")
.materialCheckBox(class="{{#if allowsComments}}is-checked{{/if}}") // .materialCheckBox(class="{{#if allowsComments}}is-checked{{/if}}")
span // span
i.fa.fa-comment-o // i.fa.fa-comment-o
| {{_ 'comment'}} // | {{_ 'comment'}}
div.check-div //div.check-div
a.flex.js-field-has-comments(class="{{#if allowsActivities}}is-checked{{/if}}") // a.flex.js-field-has-activities(class="{{#if allowsActivities}}is-checked{{/if}}")
.materialCheckBox(class="{{#if allowsActivities}}is-checked{{/if}}") // .materialCheckBox(class="{{#if allowsActivities}}is-checked{{/if}}")
span // span
i.fa.fa-history // i.fa.fa-history
| {{_ 'activities'}} // | {{_ 'activities'}}
template(name="boardSubtaskSettingsPopup") template(name="boardSubtaskSettingsPopup")
form.board-subtask-settings form.board-subtask-settings