openstack/horizon
Code Issues Proposed changes

Merge "Warn if boot volume AZ differs from instance AZ"

Browse Source
This commit is contained in:
Jenkins 2015-04-03 06:46:46 +00:00 committed by Gerrit Code Review
commit ef3d72ddae
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstack_dashboard/static/dashboard/launch-instance/source/source.html
View File

@ -223,6 +223,12 @@
</td>
<td ng-class="tableBodyCells[4].classList"
ng-style="tableBodyCells[4].style">
<span ng-if="model.newInstanceSpec.source_type.type === 'volume' && row.availability_zone !== model.newInstanceSpec.availability_zone"
class="invalid fa fa-exclamation-triangle"
popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
popover-trigger="mouseenter mouseleave"
popover-append-to-body="true"
popover-placement="top"></span>
{$ tableBodyCells[4].filter ? tableBodyCells[4].filter(row[tableBodyCells[4].key], tableBodyCells[4].filterArg) : row[tableBodyCells[4].key] $}
</td>
<td class="action-col">
@ -331,6 +337,12 @@
</td>
<td ng-class="tableBodyCells[4].classList"
ng-style="tableBodyCells[4].style">
<span ng-if="model.newInstanceSpec.source_type.type === 'volume' && row.availability_zone !== model.newInstanceSpec.availability_zone"
class="invalid fa fa-exclamation-triangle"
popover="{$ ::trCtrl.helpText.volumeAZHelpText $}"
popover-trigger="mouseenter mouseleave"
popover-append-to-body="true"
popover-placement="top"></span>
{$ tableBodyCells[4].filter ? tableBodyCells[4].filter(row[tableBodyCells[4].key], tableBodyCells[4].filterArg) : row[tableBodyCells[4].key] $}
</td>
<td class="action-col">

11
openstack_dashboard/static/dashboard/launch-instance/source/source.js
View File

@ -60,7 +60,6 @@
'decodeFilter',
'diskFormatFilter',
'gbFilter',
'yesnoFilter',
LaunchInstanceSourceCtrl
]);
@ -70,8 +69,7 @@
dateFilter,
decodeFilter,
diskFormatFilter,
gbFilter,
yesnoFilter) {
gbFilter) {
$scope.label = {
title: gettext('Instance Details'),
@ -179,7 +177,7 @@
{ text: gettext('Description'), style: { width: '20%' }, sortable: true },
{ text: gettext('Size'), style: { width: '15%' }, classList: ['number'], sortable: true },
{ text: gettext('Type'), style: { width: '20%' }, sortable: true },
{ text: gettext('Encrypted'), style: { width: '20%' }, sortable: true }
{ text: gettext('Availability Zone'), style: { width: '20%' }, sortable: true }
],
volume_snapshot: [
{ text: gettext('Name'), style: { width: '25%' }, sortable: true, sortDefault: true },
@ -217,7 +215,7 @@
{ key: 'size', filter: gbFilter, classList: ['number'] },
{ key: 'volume_image_metadata', filter: diskFormatFilter,
style: { 'text-transform': 'uppercase' } },
{ key: 'encrypted', filter: yesnoFilter }
{ key: 'availability_zone' }
],
volume_snapshot: [
{ key: 'name', classList: ['hi-light'] },
@ -246,7 +244,8 @@
function updateHelpText(key) {
angular.extend($scope.helpText, {
noneAllocText: gettext('Select a source from those listed below.'),
availHelpText: gettext('Select one')
availHelpText: gettext('Select one'),
volumeAZHelpText: gettext("When selecting volume as boot source, please ensure the instance's availability zone is compatible with your volume's availability zone.")
});
}