FIX #1525

citizenos · Nov 14, 2024 · be12941 · be12941
1 parent 78eb4ab
commit be12941
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/app/group/group.component.html b/src/app/group/group.component.html
@@ -1,7 +1,7 @@
 <div class="page_content" *ngIf="group$ | async as group;">
   <div id="page_header">
     <div id="user_info_area">
-      <ng-container *ngIf="!auth.loggedIn$.value">
+      <ng-container *ngIf="!auth.loggedIn$.value || group.visibility === GroupService.VISIBILITY.public">
         <button class="btn_medium_close icon" [routerLink]="['/', translate.currentLang, 'public', 'groups']"><svg
             width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
             <path
@@ -12,7 +12,7 @@
         <div class="small_heading mobile_hidden" [innerHTML]="'VIEWS.GROUP.HEADING_BACK_TO_PUBLIC_GROUPS'| translate">
         </div>
       </ng-container>
-      <ng-container *ngIf="auth.loggedIn$.value">
+      <ng-container *ngIf="auth.loggedIn$.value && group.visibility === GroupService.VISIBILITY.private">
         <button class="btn_medium_close icon" [routerLink]="['/', translate.currentLang, 'my', 'groups']"><svg
             width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
             <path

diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html
@@ -3,7 +3,7 @@
     <ng-container *ngIf="tabSelected$ | async as tabSelected;">
       <div id="page_header" [TourItem]="{tourid: ['topic_mobile', 'topic_tablet'], index: 2, position: 'bottom'}">
         <div id="user_info_area">
-          <ng-container *ngIf="!auth.loggedIn$.value">
+          <ng-container *ngIf="!auth.loggedIn$.value || topic.visibility === TopicService.VISIBILITY.public">
             <button [routerLink]="['/', translate.currentLang, 'public', 'topics']"><svg width="24" height="24"
                 viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path
@@ -14,7 +14,7 @@
             <div class="small_heading mobile_hidden"
               [innerHTML]="'VIEWS.TOPICS_TOPICID.HEADING_BACK_TO_PUBLIC_TOPICS'| translate"></div>
           </ng-container>
-          <ng-container *ngIf="auth.loggedIn$.value">
+          <ng-container *ngIf="auth.loggedIn$.value && topic.visibility === TopicService.VISIBILITY.private">
             <button class="btn_medium_close icon" [routerLink]="['/', translate.currentLang, 'my', 'topics']"><svg
                 width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path