Merge pull request #1870 from EmmanuelVella/xeditable-selector

Fix x-editable conflict with SonataUserBundle

Resources/public/base.js

@@ -45,7 +45,7 @@ var Admin = {
     },
 
     setup_xeditable: function(subject) {
-        jQuery('.editable', subject).editable({
+        jQuery('.x-editable', subject).editable({
             emptyclass: 'editable-empty btn btn-small',
             emptytext: '<i class="icon-edit"></i>',
             success: function(response) {

Resources/views/CRUD/base_list_field.html.twig

@@ -25,7 +25,7 @@ file that was distributed with this source code.
 
         {% if isEditable and xEditableType %}
             {% set url = path('sonata_admin_set_object_field_value', { 'context': 'list', 'field': field_description.name, 'objectId': admin.id(object), 'code': admin.code(object) })  %}
-            <span class="editable" data-type="{{ xEditableType }}" data-value="{{ value }}" data-title="{{ field_description.label|trans({}, field_description.translationDomain) }}" data-pk="{{ admin.id(object) }}" data-url="{{ url }}">
+            <span class="x-editable" data-type="{{ xEditableType }}" data-value="{{ value }}" data-title="{{ field_description.label|trans({}, field_description.translationDomain) }}" data-pk="{{ admin.id(object) }}" data-url="{{ url }}">
                 {{ block('field') }}
             </span>
         {% else %}