aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-05-22 11:13:01 +0200
committerChocobozzz <me@florianbigard.com>2023-05-22 11:13:01 +0200
commitf3bc1b541619673f14db7de220b9c520a4f35ca8 (patch)
tree91c0c2a9163386aa19306dd46100422bff8b8ccb
parentb9393464a88899530b5d87e512eee814ca3ca8d8 (diff)
downloadPeerTube-f3bc1b541619673f14db7de220b9c520a4f35ca8.tar.gz
PeerTube-f3bc1b541619673f14db7de220b9c520a4f35ca8.tar.zst
PeerTube-f3bc1b541619673f14db7de220b9c520a4f35ca8.zip
Help button must not send the parent form
-rw-r--r--client/src/app/+admin/overview/users/user-edit/user-edit.component.html1
-rw-r--r--client/src/app/shared/shared-main/misc/help.component.html1
2 files changed, 2 insertions, 0 deletions
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
index 278bd8c48..ce3226857 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
@@ -115,6 +115,7 @@
115 115
116 <div class="form-group" *ngIf="isCreation()"> 116 <div class="form-group" *ngIf="isCreation()">
117 <label i18n for="password">Password</label> 117 <label i18n for="password">Password</label>
118
118 <my-help *ngIf="isPasswordOptional()"> 119 <my-help *ngIf="isPasswordOptional()">
119 <ng-template ptTemplate="customHtml"> 120 <ng-template ptTemplate="customHtml">
120 <ng-container i18n> 121 <ng-container i18n>
diff --git a/client/src/app/shared/shared-main/misc/help.component.html b/client/src/app/shared/shared-main/misc/help.component.html
index 0252ad5cb..7f4ddfb80 100644
--- a/client/src/app/shared/shared-main/misc/help.component.html
+++ b/client/src/app/shared/shared-main/misc/help.component.html
@@ -32,6 +32,7 @@
32 [autoClose]="autoClose" 32 [autoClose]="autoClose"
33 (onHidden)="onPopoverHidden()" 33 (onHidden)="onPopoverHidden()"
34 (onShown)="onPopoverShown()" 34 (onShown)="onPopoverShown()"
35 type="button"
35> 36>
36 <my-global-icon [iconName]="iconName"></my-global-icon> 37 <my-global-icon [iconName]="iconName"></my-global-icon>
37</button> 38</button>