B #1960: Introduced the possibility to select empty value for persistent attribute (#1971)

This commit is contained in:
juanmont authored and Tino Vázquez committed 2018-04-16 17:13:25 +02:00
1 parent 22b8368117
commit fb46275ea2
2 files changed
+19 -6

No files matched your search

@@ -170,7 +170,7 @@ define(function(require) {
if (e["PERSISTENT_ONLY"] != undefined &&
e["PERSISTENT_ONLY"].toLowerCase() == "yes") {
$('#img_persistent', context).prop('disabled', true);
$('#img_persistent', context).prop('checked', true);
$('#img_persistent', context).val("YES");
pers_forced = true;
return false;
}
@@ -395,7 +395,10 @@ define(function(require) {
var type = WizardFields.retrieveInput($('#img_type', context));
img_json["TYPE"] = type;
img_json["PERSISTENT"] = $('#img_persistent:checked', context).length ? "YES" : "NO";
img_json["PERSISTENT"] = $('#img_persistent', context).val();
if ( img_json["PERSISTENT"] == "" ){
delete img_json["PERSISTENT"]
}
var dev_prefix = WizardFields.retrieveInput($('#img_dev_prefix', context));
if (dev_prefix != undefined && dev_prefix.length) {
@@ -57,10 +57,20 @@
{{#isTabActionEnabled "images-tab" "Image.persistent"}}
<div class="row">
<div class="large-4 columns">
<input type="checkbox" id="img_persistent" name="img_persistent" value="YES" />
<label for="img_persistent">
{{tr "This image is persistent"}}
</label>
<div class="row">
<div class="large-8 columns">
<label>
{{tr "This image is persistent"}}
</label>
</div>
<div class="large-4 columns">
<select id="img_persistent">
<option val=""></option>
<option val="YES"> {{tr "YES"}}</option>
<option val="NO"> {{tr "NO"}}</option>
</select>
</div>
</div>
</div>
</div>
{{/isTabActionEnabled}}