openstack/horizon
Code Issues Proposed changes

Merge "Define measurement units for RAM and disk"

Browse Source
This commit is contained in:
Zuul 2025-05-06 15:31:36 +00:00 committed by Gerrit Code Review
commit 59ac395a40
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/project/images/templates/images/images/_detail_overview.html
View File

@ -48,11 +48,11 @@
<dt>{% trans "Disk Format" %}</dt>
<dd>{{ image.disk_format|default:_("None")|upper }}</dd>
{% if image.min_disk %}
<dt>{% trans "Min Disk" %}</dt>
<dt>{% trans "Min. Disk (GB)" %}</dt>
<dd>{{ image.min_disk|diskgbformat }}</dd>
{% endif %}
{% if image.min_ram %}
<dt>{% trans "Min RAM" %}</dt>
<dt>{% trans "Min. RAM (MB)" %}</dt>
<dd>{{ image.min_ram|mb_float_format }}</dd>
{% endif %}
</dl>

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

@ -1,12 +1,12 @@
<div class="item">
<dl class="col-xs-4">
<dt translate>Min Disk (GB)</dt>
<dt translate>Min. Disk (GB)</dt>
<dd>
{$ (item.properties ? item.min_disk : item.volume_image_metadata.min_disk) || '--' $}
</dd>
</dl>
<dl class="col-xs-4">
<dt translate>Min RAM (MB)</dt>
<dt translate>Min. RAM (MB)</dt>
<dd>
{$ (item.properties ? item.min_ram : item.volume_image_metadata.min_ram) || '--' $}
</dd>

8
openstack_dashboard/static/app/core/images/steps/edit-image/edit-image.html
View File

@ -93,10 +93,10 @@
type="number" class="form-control"
ng-required="true"
ng-pattern="ctrl.validationRules.integer" ng-model="ctrl.image.min_disk"
placeholder="{$ 'The minimum disk size required to boot the image. If unspecified, this value defaults to 0 (no minimum).'|translate $}">
placeholder="{$ 'The minimum disk (GB) size required to boot the image. If unspecified, this value defaults to 0 (no minimum).'|translate $}">
<p class="help-block alert alert-danger"
ng-show="imageForm.min_disk.$invalid && imageForm.min_disk.$dirty">
<translate>min disk is required and must be an integer not less than 0</translate>
<translate>The minimum disk (GB) is required and must be an integer not less than 0.</translate>
</p>
</div>
</div>
@ -108,10 +108,10 @@
type="number" class="form-control"
ng-required="true"
ng-pattern="ctrl.validationRules.integer" ng-model="ctrl.image.min_ram"
placeholder="{$ 'The minimum memory size required to boot the image. If unspecified, this value defaults to 0 (no minimum).'|translate $}">
placeholder="{$ 'The minimum memory (MB) size required to boot the image. If unspecified, this value defaults to 0 (no minimum).'|translate $}">
<p class="help-block alert alert-danger"
ng-show="imageForm.min_ram.$invalid && imageForm.min_ram.$dirty">
<translate>min ram is required and must be an integer not less than 0</translate>
<translate>The minimum memory (MB) is required and must be an integer not less than 0.</translate>
</p>
</div>
</div>