diff options
author | Micah Elizabeth Scott <beth@scanlime.org> | 2018-10-07 13:07:14 -0700 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2018-10-07 22:07:14 +0200 |
commit | 211239ed949da6b1cd4e554b374fd875e2bfb5e4 (patch) | |
tree | a8f2cf3ab271074dcfec5a0a4159a2f9a9c6a816 /client/src/app/+admin | |
parent | 302e7b19da6c80022cee7b1466f88ee94b4fec67 (diff) | |
download | PeerTube-211239ed949da6b1cd4e554b374fd875e2bfb5e4.tar.gz PeerTube-211239ed949da6b1cd4e554b374fd875e2bfb5e4.tar.zst PeerTube-211239ed949da6b1cd4e554b374fd875e2bfb5e4.zip |
remove confirm modal for asset injection in edit-custom-config (#1219)
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | 24 |
1 files changed, 0 insertions, 24 deletions
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 4983b0425..25b303f44 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 | |||
@@ -1,6 +1,5 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
2 | import { ConfigService } from '@app/+admin/config/shared/config.service' | 2 | import { ConfigService } from '@app/+admin/config/shared/config.service' |
3 | import { ConfirmService } from '@app/core' | ||
4 | import { ServerService } from '@app/core/server/server.service' | 3 | import { ServerService } from '@app/core/server/server.service' |
5 | import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared' | 4 | import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared' |
6 | import { NotificationsService } from 'angular2-notifications' | 5 | import { NotificationsService } from 'angular2-notifications' |
@@ -29,7 +28,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
29 | private notificationsService: NotificationsService, | 28 | private notificationsService: NotificationsService, |
30 | private configService: ConfigService, | 29 | private configService: ConfigService, |
31 | private serverService: ServerService, | 30 | private serverService: ServerService, |
32 | private confirmService: ConfirmService, | ||
33 | private i18n: I18n | 31 | private i18n: I18n |
34 | ) { | 32 | ) { |
35 | super() | 33 | super() |
@@ -124,28 +122,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
124 | } | 122 | } |
125 | 123 | ||
126 | async formValidated () { | 124 | async formValidated () { |
127 | const newCustomizationJavascript = this.form.value['customizationJavascript'] | ||
128 | const newCustomizationCSS = this.form.value['customizationCSS'] | ||
129 | |||
130 | const customizations = [] | ||
131 | if (newCustomizationJavascript && newCustomizationJavascript !== this.oldCustomJavascript) customizations.push('JavaScript') | ||
132 | if (newCustomizationCSS && newCustomizationCSS !== this.oldCustomCSS) customizations.push('CSS') | ||
133 | |||
134 | if (customizations.length !== 0) { | ||
135 | const customizationsText = customizations.join('/') | ||
136 | |||
137 | // FIXME: i18n service does not support string concatenation | ||
138 | const message = this.i18n('You set custom {{customizationsText}}. ', { customizationsText }) + | ||
139 | this.i18n('This could lead to security issues or bugs if you do not understand it. ') + | ||
140 | this.i18n('Are you sure you want to update the configuration?') | ||
141 | |||
142 | const label = this.i18n('Please type') + ` "I understand the ${customizationsText} I set" ` + this.i18n('to confirm.') | ||
143 | const expectedInputValue = `I understand the ${customizationsText} I set` | ||
144 | |||
145 | const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue) | ||
146 | if (confirmRes === false) return | ||
147 | } | ||
148 | |||
149 | const data: CustomConfig = { | 125 | const data: CustomConfig = { |
150 | instance: { | 126 | instance: { |
151 | name: this.form.value['instanceName'], | 127 | name: this.form.value['instanceName'], |