Skip to content

Commit

Permalink
Merge pull request #440 from mzazrivec/add_support_for_dialog_reconfi…
Browse files Browse the repository at this point in the history
…gure

dialog-user: add flag for dialog reconfigure
(cherry picked from commit 5e79adf)

https://bugzilla.redhat.com/show_bug.cgi?id=1837410
  • Loading branch information
himdel authored and simaishi committed May 26, 2020
1 parent fd6a778 commit 90e3d69
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/dialog-user/components/dialog-user/dialog.html
Expand Up @@ -13,7 +13,7 @@ <h2 translate>No Provisioning Dialog Available.</h2>
</div>
<div class="panel-body">
<div ng-repeat="field in buttonGroup.dialog_fields">
<dialog-field on-update="vm.updateDialogField(dialogFieldName, value)" single-refresh="vm.refreshSingleField(field)" field="vm.dialogFields[field.name]" input-disabled="vm.inputDisabled"></dialog-field>
<dialog-field on-update="vm.updateDialogField(dialogFieldName, value)" single-refresh="vm.refreshSingleField(field)" field="vm.dialogFields[field.name]" input-disabled="vm.inputDisabled" reconfigure-mode="vm.reconfigureMode"></dialog-field>
</div>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions src/dialog-user/components/dialog-user/dialogField.html
Expand Up @@ -15,7 +15,7 @@
<div ng-switch on="vm.dialogField.type">
<div class="col-sm-4" ng-switch-when="DialogFieldTextBox">
<input ng-model="vm.dialogField.default_value"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
ng-change="vm.changesHappened()"
ng-model-options="{debounce: {'default': 500}}"
class="form-control"
Expand All @@ -29,7 +29,7 @@

<div class="col-sm-8" ng-switch-when="DialogFieldTextAreaBox">
<textarea ng-model="vm.dialogField.default_value"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
ng-change="vm.changesHappened()"
ng-model-options="{debounce: {'default': 500}}"
class="form-control"
Expand All @@ -46,7 +46,7 @@
<input ng-model="vm.dialogField.default_value"
ng-true-value="'t'"
ng-false-value="'f'"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
ng-change="vm.changesHappened()"
type="checkbox"
uib-tooltip="{{ ::inputTitle }}"
Expand All @@ -62,7 +62,7 @@
ng-model="vm.dialogField.default_value"
watch-model="vm.dialogField.values"
ng-change="vm.changesHappened()"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
class="form-control"
data-container="body"
id="{{ vm.dialogField.name }}"
Expand All @@ -77,7 +77,7 @@
ng-model="vm.dialogField.default_value"
watch-model="vm.dialogField.values"
ng-change="vm.changesHappened()"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
input-id="{{ vm.dialogField.name }}"
ng-options="value[0] as value[1] for value in vm.dialogField.values"
miq-options="{ 'data-tokens': value[0] + ' ' + value[1] }"
Expand All @@ -89,7 +89,7 @@
<div class="col-sm-6" ng-switch-when="DialogFieldTagControl">
<select ng-if="vm.dialogField.options.force_single_value"
ng-model="vm.dialogField.default_value"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
ng-change="vm.changesHappened()"
class="form-control"
ng-options="fieldValue.id as fieldValue.description for fieldValue in vm.dialogField.values"
Expand All @@ -99,7 +99,7 @@
<select ng-if="!vm.dialogField.options.force_single_value"
multiple
ng-model="vm.dialogField.default_value"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
ng-change="vm.changesHappened()"
class="form-control"
ng-options="fieldValue.id as fieldValue.description for fieldValue in vm.dialogField.values"
Expand All @@ -120,7 +120,7 @@
<input type="radio"
ng-model="vm.dialogField.default_value"
ng-change="vm.changesHappened()"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
name="{{ vm.dialogField.name }}"
value="{{ ::fieldValue[0] }}"
id="{{ vm.dialogField.name }}"/>
Expand Down
7 changes: 6 additions & 1 deletion src/dialog-user/components/dialog-user/dialogField.ts
Expand Up @@ -13,6 +13,7 @@ export class DialogFieldController {
public singleRefresh: any;
public options: any;
public inputDisabled: boolean;
public reconfigureMode: boolean;

public service: any;
public dialogField: any;
Expand Down Expand Up @@ -49,6 +50,9 @@ export class DialogFieldController {
public setup() {
this.clonedDialogField = _.cloneDeep(this.field);
this.dialogField = this.service.setupField(this.field);
if (this.reconfigureMode && !this.dialogField.reconfigurable) {
this.dialogField.disabled = true;
}

if ((this.dialogField.type === 'DialogFieldDateTimeControl') ||
(this.dialogField.type === 'DialogFieldDateControl')) {
Expand Down Expand Up @@ -146,6 +150,7 @@ export default class DialogField {
onUpdate: '&',
singleRefresh: '&',
options: '=?',
inputDisabled: '=?'
inputDisabled: '=?',
reconfigureMode: '<'
};
}
3 changes: 2 additions & 1 deletion src/dialog-user/components/dialog-user/dialogUser.ts
Expand Up @@ -293,6 +293,7 @@ export default class DialogUser {
dialog: '<',
refreshField: '&',
onUpdate: '&',
inputDisabled: '=?'
inputDisabled: '=?',
reconfigureMode: '<'
};
}

0 comments on commit 90e3d69

Please sign in to comment.