Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
895
Issues
895
List
Boards
Labels
Service Desk
Milestones
Merge Requests
48
Merge Requests
48
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
6f286102
Commit
6f286102
authored
6 minutes ago
by
Brian Hatchet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
relinted
parent
4f00b18e
fix/comments-media-gallery-1601
1 merge request
!469
Fix/comments media gallery 1601
Pipeline
#80330168
running with stages
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
58 additions
and
21 deletions
+58
-21
post-menu.component.html
src/app/common/components/post-menu/post-menu.component.html
+23
-3
view.ts
src/app/modules/blogs/view/view.ts
+1
-1
comment.component.html
src/app/modules/comments/comment/comment.component.html
+18
-3
list.component.html
src/app/modules/comments/list/list.component.html
+8
-6
list.component.ts
src/app/modules/comments/list/list.component.ts
+2
-2
thread.component.html
src/app/modules/comments/thread/thread.component.html
+1
-1
view.component.html
src/app/modules/media/view/view.component.html
+5
-5
No files found.
src/app/common/components/post-menu/post-menu.component.html
View file @
6f286102
...
...
@@ -199,9 +199,29 @@
</li>
</ng-container>
<!-- ALLOW COMMENTS -->
<ng-container
*ngIf=
"featuresService.has('allow-comments-toggle') && options.indexOf('allow-comments') !== -1 && entity.ownerObj.guid == session.getLoggedInUser().guid "
>
<li
class=
"mdl-menu__item"
*ngIf=
"!entity.allow_comments"
(click)=
"allowComments(true)"
i18n=
"@@COMMON__POST_MENU__ALLOW_COMMENTS"
>
Allow Comments
</li>
<li
class=
"mdl-menu__item"
*ngIf=
"entity.allow_comments"
(click)=
"allowComments(false)"
i18n=
"@@COMMON__POST_MENU__DISABLE_COMMENTS"
>
Disable Comments
</li>
<ng-container
*ngIf=
"
featuresService.has('allow-comments-toggle') &&
options.indexOf('allow-comments') !== -1 &&
entity.ownerObj.guid == session.getLoggedInUser().guid
"
>
<li
class=
"mdl-menu__item"
*ngIf=
"!entity.allow_comments"
(click)=
"allowComments(true)"
i18n=
"@@COMMON__POST_MENU__ALLOW_COMMENTS"
>
Allow Comments
</li>
<li
class=
"mdl-menu__item"
*ngIf=
"entity.allow_comments"
(click)=
"allowComments(false)"
i18n=
"@@COMMON__POST_MENU__DISABLE_COMMENTS"
>
Disable Comments
</li>
</ng-container>
<!-- ADMIN EDIT FLAGS -->
<ng-container
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/blogs/view/view.ts
View file @
6f286102
...
...
@@ -145,7 +145,7 @@ export class BlogView implements OnInit, OnDestroy {
ngOnDestroy
()
{
if
(
this
.
scroll_listener
)
{
this
.
scroll
.
unListen
(
this
.
scroll_listener
);
this
.
scroll
.
unListen
(
this
.
scroll_listener
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/comments/comment/comment.component.html
View file @
6f286102
...
...
@@ -384,9 +384,24 @@
(click)=
"toggleReplies()"
*ngIf=
"comment.can_reply"
>
<i
*ngIf=
"comment.replies_count > 0 || (activityService.allowComment$ | async)"
class=
"material-icons"
>
reply
</i>
<span
*ngIf=
"comment.replies_count > 0"
>
{{ comment.replies_count }} Replies
</span>
<span
*ngIf=
"comment.replies_count <= 0 && (activityService.allowComment$ | async)"
>
Reply
</span>
<i
*ngIf=
"
comment.replies_count > 0 ||
(activityService.allowComment$ | async)
"
class=
"material-icons"
>
reply
</i
>
<span
*ngIf=
"comment.replies_count > 0"
>
{{ comment.replies_count }} Replies
</span
>
<span
*ngIf=
"
comment.replies_count <= 0 &&
(activityService.allowComment$ | async)
"
>
Reply
</span
>
</span>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/comments/list/list.component.html
View file @
6f286102
...
...
@@ -44,12 +44,14 @@
<p
class=
"m-comments--start-conversation-label"
*ngIf=
"!descendingInProgress
&& !ascendingInProgress
&& !error
&& comments?.length === 0
&& parent.type == 'activity'
&& activityService.allowComment$"
*ngIf=
"
!descendingInProgress &&
!ascendingInProgress &&
!error &&
comments?.length === 0 &&
parent.type == 'activity' &&
activityService.allowComment$
"
i18n=
"@@MINDS__COMMENTS__START_CONVERSATION"
>
Start the conversation!
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/comments/list/list.component.ts
View file @
6f286102
...
...
@@ -111,9 +111,9 @@ export class CommentsListComponent implements OnInit, OnDestroy {
set
_reversed
(
value
:
boolean
)
{
if
(
value
)
{
this
.
reversed
=
true
;
this
.
reversed
=
true
;
}
else
{
this
.
reversed
=
false
;
this
.
reversed
=
false
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/comments/thread/thread.component.html
View file @
6f286102
...
...
@@ -112,7 +112,7 @@
</div>
<m-comment
__poster
*ngIf=
"
(activityService.allowComment$ | async)
"
*ngIf=
"
activityService.allowComment$ | async
"
[guid]=
"guid"
[parent]=
"parent"
[entity]=
"entity"
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/media/view/view.component.html
View file @
6f286102
...
...
@@ -273,11 +273,11 @@
</div>
<!-- Don't show comments for albums -->
<div
class=
"mdl-grid m-media-content--comments mdl-color--white"
*ngIf=
"canShowComments() || (activityService.allowComment$ | async)"
>
<m-comments
__tree
[entity]=
"entity
"
>
</m-comments
__tree
>
<div
class=
"mdl-grid m-media-content--comments mdl-color--white"
*ngIf=
"canShowComments() || (activityService.allowComment$ | async)
"
>
<
m-comments
__tree
[entity]=
"entity"
>
<
/m-comments
__tree
>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment