Merge "Cherry-pick the following commits from master:" into release-0.4
This commit is contained in:
commit
5239e01163
|
@ -45,13 +45,16 @@ def filter_service_by_image_type(service, request):
|
|||
for image in available_images:
|
||||
registered_murano_images.append(image.murano_property.get('type'))
|
||||
|
||||
for type in registered_murano_images:
|
||||
if specified_image_type in type:
|
||||
filtered = True
|
||||
message = ''
|
||||
else:
|
||||
message = 'Murano image type "{0}" is not registered'.format(
|
||||
specified_image_type)
|
||||
if registered_murano_images:
|
||||
for type in registered_murano_images:
|
||||
if specified_image_type in type:
|
||||
filtered = True
|
||||
break
|
||||
if not filtered:
|
||||
message = 'Murano image type "{0}" is not registered'.format(
|
||||
specified_image_type)
|
||||
else:
|
||||
message = ''
|
||||
return filtered, message
|
||||
|
||||
|
||||
|
|
|
@ -103,7 +103,7 @@ class UploadFileForm(UploadFileKnownTypeForm):
|
|||
'scripts': 'Script for agent execution'
|
||||
}
|
||||
|
||||
data_type = forms.ChoiceField(label=_('File data type'),
|
||||
data_type = forms.ChoiceField(label=_('File Type'),
|
||||
choices=(supported_data_types.items()))
|
||||
|
||||
def handle(self, request, data):
|
||||
|
|
|
@ -126,8 +126,9 @@
|
|||
}
|
||||
$(rowRef).remove();
|
||||
});
|
||||
|
||||
$('.data-grid .table_caption').remove()
|
||||
});
|
||||
</script>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<script>
|
||||
$('.data-grid .table_caption').remove()
|
||||
</script>
|
||||
|
|
Loading…
Reference in New Issue