Merge "Fix a bug when restore a nova instance from UI."

This commit is contained in:
Jenkins 2017-05-15 16:17:55 +00:00 committed by Gerrit Code Review
commit 19c8be2373
2 changed files with 8 additions and 8 deletions

View File

@ -101,7 +101,7 @@ class ActionConfigurationAction(workflows.Action):
help_text=_("Id of nova instance for backup"),
required=False)
nova_network_id = forms.CharField(
nova_restore_network = forms.CharField(
label=_("Nova network ID *"),
help_text=_("Id of nova network for recover"),
required=False)
@ -184,14 +184,14 @@ class ActionConfigurationAction(workflows.Action):
self._check_container(cleaned_data)
self._check_backup_name(cleaned_data)
self._check_nova_inst_id(cleaned_data)
self._check_nova_network_id(cleaned_data)
self._check_nova_restore_network(cleaned_data)
return cleaned_data
def _check_nova_network_id(self, cleaned_data):
if not cleaned_data.get('nova_network_id'):
def _check_nova_restore_network(self, cleaned_data):
if not cleaned_data.get('nova_restore_network'):
msg = _("You must define nova network id to restore.")
self._errors['nova_network_id'] = self.error_class([msg])
self._errors['nova_restore_network'] = self.error_class([msg])
def _check_nova_inst_id(self, cleaned_data):
if not cleaned_data.get('nova_inst_id'):
@ -275,7 +275,7 @@ class ActionConfiguration(workflows.Step):
'restore_from_date',
'cinder_vol_id',
'nova_inst_id',
'nova_network_id',
'nova_restore_network',
'get_object',
'dst_file',
'remove_older_than',

View File

@ -37,7 +37,7 @@ function hideEverything() {
$("#id_restore_from_host").closest(".form-group").hide();
$("#id_restore_from_date").closest(".form-group").hide();
$("#restore-warning").hide();
$("#id_nova_network_id").closest(".form-group").hide();
$("#id_nova_restore_network").closest(".form-group").hide();
// Admin specific controls
$("#id_remove_older_than").closest(".form-group").hide();
@ -131,7 +131,7 @@ function setModeOptions() {
$("#id_cinder_vol_id").closest(".form-group").show();
} else if ($id_mode === 'nova') {
$("#id_nova_inst_id").closest(".form-group").show();
$("#id_nova_network_id").closest(".form-group").show();
$("#id_nova_restore_network").closest(".form-group").show();
}
}
}