openstack
/
horizon
Code Issues Proposed changes

Merge "Correct error message for volume size in Launch Instance"

This commit is contained in:
Zuul 2019-02-09 08:58:08 +00:00 committed by Gerrit Code Review
parent 91d45cf269 a06e7de97a
commit e3ca6a5e5b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
View File

@ -56,6 +56,7 @@
) {
var ctrl = this;
ctrl.volumeSizeError = gettext('Volume size is required and must be an integer');
// Error text for invalid fields
/*eslint-disable max-len */
@ -539,10 +540,10 @@
}
var volumeSizeText = gettext('The volume size must be at least %(minVolumeSize)s GB');
var volumeSizeObj = { minVolumeSize: ctrl.minVolumeSize };
ctrl.volumeSizeError = interpolate(volumeSizeText, volumeSizeObj, true);
ctrl.minVolumeSizeError = interpolate(volumeSizeText, volumeSizeObj, true);
} else {
ctrl.minVolumeSize = 0;
ctrl.volumeSizeError = gettext('Volume size is required and must be an integer');
ctrl.minVolumeSizeError = gettext('Volume size is required and must be an integer');
}
}

2
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html
View File

@ -63,7 +63,7 @@
<span class="hz-icon-required fa fa-asterisk"></span>
</label>
<input name="volume-size"
min="{$ ctrl.minVolumeSize $}"
validate-number-min="{$ ctrl.minVolumeSize $}"
id="volume-size"
type="number"
class="form-control"