diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-08 15:47:44 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-08 15:47:44 +0200 |
commit | 0dc647775881eb1378b213a530996cd096de24ea (patch) | |
tree | 2b9042cb56ecb876d5c707bdf550fa1303df047c /client/src/app/+admin/config | |
parent | 14893eb71cb2d4ca47e07589c81958863603aba4 (diff) | |
download | PeerTube-0dc647775881eb1378b213a530996cd096de24ea.tar.gz PeerTube-0dc647775881eb1378b213a530996cd096de24ea.tar.zst PeerTube-0dc647775881eb1378b213a530996cd096de24ea.zip |
Add delete/manual approval instance followers in client
Diffstat (limited to 'client/src/app/+admin/config')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 27 | ||||
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | 8 |
2 files changed, 34 insertions, 1 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 00a0d98f8..637484622 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | |||
@@ -84,6 +84,7 @@ | |||
84 | </div> | 84 | </div> |
85 | </ng-container> | 85 | </ng-container> |
86 | 86 | ||
87 | |||
87 | <div i18n class="inner-form-title">Signup</div> | 88 | <div i18n class="inner-form-title">Signup</div> |
88 | 89 | ||
89 | <ng-container formGroupName="signup"> | 90 | <ng-container formGroupName="signup"> |
@@ -111,6 +112,7 @@ | |||
111 | </div> | 112 | </div> |
112 | </ng-container> | 113 | </ng-container> |
113 | 114 | ||
115 | |||
114 | <div i18n class="inner-form-title">Users</div> | 116 | <div i18n class="inner-form-title">Users</div> |
115 | 117 | ||
116 | <ng-container formGroupName="user"> | 118 | <ng-container formGroupName="user"> |
@@ -139,6 +141,7 @@ | |||
139 | </div> | 141 | </div> |
140 | </ng-container> | 142 | </ng-container> |
141 | 143 | ||
144 | |||
142 | <div i18n class="inner-form-title">Import</div> | 145 | <div i18n class="inner-form-title">Import</div> |
143 | 146 | ||
144 | <ng-container formGroupName="import"> | 147 | <ng-container formGroupName="import"> |
@@ -161,6 +164,7 @@ | |||
161 | </ng-container> | 164 | </ng-container> |
162 | </ng-container> | 165 | </ng-container> |
163 | 166 | ||
167 | |||
164 | <div i18n class="inner-form-title">Auto-blacklist</div> | 168 | <div i18n class="inner-form-title">Auto-blacklist</div> |
165 | 169 | ||
166 | <ng-container formGroupName="autoBlacklist"> | 170 | <ng-container formGroupName="autoBlacklist"> |
@@ -178,6 +182,29 @@ | |||
178 | </ng-container> | 182 | </ng-container> |
179 | </ng-container> | 183 | </ng-container> |
180 | 184 | ||
185 | |||
186 | <div i18n class="inner-form-title">Instance followers</div> | ||
187 | |||
188 | <ng-container formGroupName="followers"> | ||
189 | <ng-container formGroupName="instance"> | ||
190 | |||
191 | <div class="form-group"> | ||
192 | <my-peertube-checkbox | ||
193 | inputName="followersInstanceEnabled" formControlName="enabled" | ||
194 | i18n-labelText labelText="Other instances can follow your instance" | ||
195 | ></my-peertube-checkbox> | ||
196 | </div> | ||
197 | |||
198 | <div class="form-group"> | ||
199 | <my-peertube-checkbox | ||
200 | inputName="followersInstanceManualApproval" formControlName="manualApproval" | ||
201 | i18n-labelText labelText="Manually approve new instance follower" | ||
202 | ></my-peertube-checkbox> | ||
203 | </div> | ||
204 | </ng-container> | ||
205 | </ng-container> | ||
206 | |||
207 | |||
181 | <div i18n class="inner-form-title">Administrator</div> | 208 | <div i18n class="inner-form-title">Administrator</div> |
182 | 209 | ||
183 | <div class="form-group" formGroupName="admin"> | 210 | <div class="form-group" formGroupName="admin"> |
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index d8eb55da7..e64750713 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -5,7 +5,7 @@ import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } fr | |||
5 | import { Notifier } from '@app/core' | 5 | import { Notifier } from '@app/core' |
6 | import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' | 6 | import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' |
7 | import { I18n } from '@ngx-translate/i18n-polyfill' | 7 | import { I18n } from '@ngx-translate/i18n-polyfill' |
8 | import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 8 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' |
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
11 | selector: 'my-edit-custom-config', | 11 | selector: 'my-edit-custom-config', |
@@ -124,6 +124,12 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
124 | enabled: null | 124 | enabled: null |
125 | } | 125 | } |
126 | } | 126 | } |
127 | }, | ||
128 | followers: { | ||
129 | instance: { | ||
130 | enabled: null, | ||
131 | manualApproval: null | ||
132 | } | ||
127 | } | 133 | } |
128 | } | 134 | } |
129 | 135 | ||