Commit f7fe5309 authored by Mark Harding's avatar Mark Harding
Browse files

(fix): do not show pencil icon if only need to delete

parent c14a0032

src/app/modules/comments/comment/comment.component.html

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
        <i class="material-icons">public</i>

        <i class="material-icons">public</i>

      </li>

      </li>

      <li class="m-commentRibbon__item"

      <li class="m-commentRibbon__item"

        *ngIf="comment.owner_guid == session.getLoggedInUser()?.guid || session.isAdmin() || parent.owner_guid == session.getLoggedInUser()?.guid || canEdit"

        *ngIf="comment.owner_guid == session.getLoggedInUser()?.guid || session.isAdmin() || parent.owner_guid == session.getLoggedInUser()?.guid || canDelete"

        (click)="delete(); toggle.value = false"

        (click)="delete(); toggle.value = false"

        title="Delete"

        title="Delete"

        i18n-title="@@M__ACTION__DELETE"

        i18n-title="@@M__ACTION__DELETE"

src/app/modules/comments/comment/comment.component.ts

+1 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,7 @@ export class CommentComponentV2 implements OnChanges { 
  translateToggle: boolean = false;

  translateToggle: boolean = false;

  commentAge$: Observable<number>;

  commentAge$: Observable<number>;

  @Input() canEdit: boolean = false;

  @Input() canEdit: boolean = false;

  @Input() canDelete: boolean = false;





  @Output() onReply = new EventEmitter();

  @Output() onReply = new EventEmitter();

src/app/modules/comments/thread/thread.component.html

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ 
      [parent]="parent"

      [parent]="parent"

      [level]="level"

      [level]="level"

      [canEdit]="canEdit"

      [canEdit]="canEdit"

      [canDelete]="canDelete"

      [showReplies]="comment.show_replies"

      [showReplies]="comment.show_replies"

      (delete)="delete(i)"

      (delete)="delete(i)"

      (saved)="edited(i, $event)"

      (saved)="edited(i, $event)"

src/app/modules/comments/thread/thread.component.ts

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ export class CommentsThreadComponent { 
  @Input() entity;

  @Input() entity;

  @Input() entityGuid;

  @Input() entityGuid;

  @Input() canEdit: boolean = false;

  @Input() canEdit: boolean = false;

  @Input() canDelete: boolean = false;

  @Input() readonly: boolean = false;

  @Input() readonly: boolean = false;

  @Input() conversation: boolean = false;

  @Input() conversation: boolean = false;

  @Input() limit: number = 12;

  @Input() limit: number = 12;

src/app/modules/comments/tree/tree.component.html

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
  [entity]="entity"

  [entity]="entity"

  [parent]="entity"

  [parent]="entity"

  [canEdit]="canEdit"

  [canEdit]="canEdit"

  [canDelete]="canDelete"

  [readonly]="readonly"

  [readonly]="readonly"

  [level]="0"

  [level]="0"

  [limit]="limit"

  [limit]="limit"