Unverified Commit 280c76b5 authored by Petrus Janse van Rensburg's avatar Petrus Janse van Rensburg Committed by GitHub

Merge pull request #1744 from flask-admin/inline-boolean

x-editable inline boolean fixes
parents e4d83a91 7d95b604
Changelog Changelog
========= =========
Next release
-----
* Fix display of inline x-editable boolean fields on list view
1.5.3 1.5.3
----- -----
......
...@@ -110,6 +110,7 @@ class XEditableWidget(object): ...@@ -110,6 +110,7 @@ class XEditableWidget(object):
kwargs['data-rows'] = '5' kwargs['data-rows'] = '5'
elif field.type == 'BooleanField': elif field.type == 'BooleanField':
kwargs['data-type'] = 'select2' kwargs['data-type'] = 'select2'
kwargs['data-value'] = '1' if field.data else ''
# data-source = dropdown options # data-source = dropdown options
kwargs['data-source'] = json.dumps([ kwargs['data-source'] = json.dumps([
{'value': '', 'text': gettext('No')}, {'value': '', 'text': gettext('No')},
......
...@@ -494,15 +494,21 @@ ...@@ -494,15 +494,21 @@
case 'x-editable-boolean': case 'x-editable-boolean':
$el.editable({ $el.editable({
params: overrideXeditableParams, params: overrideXeditableParams,
display: function(value, sourceData, response) { display: function(value, response) {
// display new boolean value as an icon // display boolean value as an icon
if(response) { if(value == '1') {
if(value == '1') { $(this).html('<span class="fa fa-check-circle glyphicon glyphicon-ok-circle icon-ok-circle"></span>');
$(this).html('<span class="fa fa-check-circle glyphicon glyphicon-ok-circle icon-ok-circle"></span>'); } else {
} else { $(this).html('<span class="fa fa-minus-circle glyphicon glyphicon-minus-sign icon-minus-sign"></span>');
$(this).html('<span class="fa fa-minus-circle glyphicon glyphicon-minus-sign icon-minus-sign"></span>');
}
} }
},
success: function(response, newValue) {
// update display
if(newValue == '1') {
$(this).html('<span class="fa fa-check-circle glyphicon glyphicon-ok-circle icon-ok-circle"></span>');
} else {
$(this).html('<span class="fa fa-minus-circle glyphicon glyphicon-minus-sign icon-minus-sign"></span>');
}
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment