RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/dashboard: Use forms in RGW subuser modal

Browse Source 
Signed-off-by: Stephan Müller <smueller@suse.com>
This commit is contained in:
Stephan Müller 2018-06-19 16:17:44 +02:00
parent 297e111f07
commit 01932a5363
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html
View File

@ -17,7 +17,7 @@
<!-- Username -->
<div class="form-group"
[ngClass]="{'has-error': (frm.submitted || formGroup.controls.uid.dirty) && formGroup.controls.uid.invalid}">
[ngClass]="{'has-error': formGroup.showError('uid', frm)}">
<label class="control-label col-sm-3"
for="uid"
i18n>Username
@ -33,7 +33,7 @@
<!-- Subuser -->
<div class="form-group"
[ngClass]="{'has-error': (frm.submitted || formGroup.controls.subuid.dirty) && formGroup.controls.subuid.invalid}">
[ngClass]="{'has-error': formGroup.showError('subuid', frm)}">
<label class="control-label col-sm-3"
for="subuid"
i18n>Subuser
@ -49,12 +49,12 @@
[readonly]="editing"
autofocus>
<span class="help-block"
*ngIf="(frm.submitted || formGroup.controls.subuid.dirty) && formGroup.controls.subuid.hasError('required')"
*ngIf="formGroup.showError('subuid', frm, 'required')"
i18n>
This field is required.
</span>
<span class="help-block"
*ngIf="(frm.submitted || formGroup.controls.subuid.dirty) && formGroup.controls.subuid.hasError('subuserIdExists')"
*ngIf="formGroup.showError('subuid', frm, 'subuserIdExists')"
i18n>
The chosen subuser ID is already in use.
</span>
@ -63,7 +63,7 @@
<!-- Permission -->
<div class="form-group"
[ngClass]="{'has-error': (frm.submitted || formGroup.controls.perm.dirty) && formGroup.controls.perm.invalid}">
[ngClass]="{'has-error': formGroup.showError('perm', frm)}">
<label class="control-label col-sm-3"
for="perm"
i18n>Permission
@ -91,7 +91,7 @@
</option>
</select>
<span class="help-block"
*ngIf="(frm.submitted || formGroup.controls.perm.dirty) && formGroup.controls.perm.hasError('required')"
*ngIf="formGroup.showError('perm', frm, 'required')"
i18n>
This field is required.
</span>
@ -118,8 +118,8 @@
<!-- Secret key -->
<div class="form-group"
[ngClass]="{'has-error': (frm.submitted || formGroup.controls.secret_key.dirty) && formGroup.controls.secret_key.invalid}"
*ngIf="!editing && !formGroup.controls.generate_secret.value">
[ngClass]="{'has-error': formGroup.showError('secret_key', frm)}"
*ngIf="!editing && !formGroup.getValue('generate_secret')">
<label class="control-label col-sm-3"
for="secret_key"
i18n>Secret key
@ -143,7 +143,7 @@
</span>
</div>
<span class="help-block"
*ngIf="(frm.submitted || formGroup.controls.secret_key.dirty) && formGroup.controls.secret_key.hasError('required')"
*ngIf="formGroup.showError('secret_key', frm, 'required')"
i18n>
This field is required.
</span>

15
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts
View File

@ -1,16 +1,11 @@
import { Component, EventEmitter, Output } from '@angular/core';
import {
AbstractControl,
FormBuilder,
FormGroup,
ValidationErrors,
ValidatorFn,
Validators
} from '@angular/forms';
import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from '@angular/forms';
import * as _ from 'lodash';
import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service';
import { CdFormBuilder } from '../../../shared/forms/cd-form-builder';
import { CdFormGroup } from '../../../shared/forms/cd-form-group';
import { CdValidators, isEmptyInputValue } from '../../../shared/validators/cd-validators';
import { RgwUserSubuser } from '../models/rgw-user-subuser';
@ -26,11 +21,11 @@ export class RgwUserSubuserModalComponent {
*/
@Output() submitAction = new EventEmitter();
formGroup: FormGroup;
formGroup: CdFormGroup;
editing = true;
subusers: RgwUserSubuser[] = [];
constructor(private formBuilder: FormBuilder, public bsModalRef: BsModalRef) {
constructor(private formBuilder: CdFormBuilder, public bsModalRef: BsModalRef) {
this.createForm();
this.listenToChanges();
}