RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38519 from rhcs-dashboard/fix-47727-master

Browse Source 
mgr/dashboard: RGW User Form is validating disabled fields

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
This commit is contained in:
Ernesto Puerta 2020-12-11 17:14:50 +01:00 committed by GitHub
commit 6a40305be4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts
View File

@ -61,6 +61,8 @@ export class RgwUserFormComponent extends CdForm implements OnInit {
this.subuserLabel = $localize`subuser`;
this.s3keyLabel = $localize`S3 Key`;
this.capabilityLabel = $localize`capability`;
this.editing = this.router.url.startsWith(`/rgw/user/${URLVerbs.EDIT}`);
this.action = this.editing ? this.actionLabels.EDIT : this.actionLabels.CREATE;
this.createForm();
}
@ -70,7 +72,7 @@ export class RgwUserFormComponent extends CdForm implements OnInit {
uid: [
null,
[Validators.required],
[CdValidators.unique(this.rgwUserService.exists, this.rgwUserService)]
this.editing ? [] : [CdValidators.unique(this.rgwUserService.exists, this.rgwUserService)]
],
display_name: [null, [Validators.required]],
email: [
@ -148,8 +150,6 @@ export class RgwUserFormComponent extends CdForm implements OnInit {
}
ngOnInit() {
this.editing = this.router.url.startsWith(`/rgw/user/${URLVerbs.EDIT}`);
this.action = this.editing ? this.actionLabels.EDIT : this.actionLabels.CREATE;
// Process route parameters.
this.route.params.subscribe((params: { uid: string }) => {
if (!params.hasOwnProperty('uid')) {