-
-
Save pcahard/55b32647878b6e0a8a64 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -urN vendor-original/oro/platform/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php vendor/oro/platform/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php | |
--- vendor-original/oro/platform/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php 2015-10-26 09:45:05.090416111 +0100 | |
+++ vendor/oro/platform/src/Oro/Bundle/FormBundle/Form/Type/OroJquerySelect2HiddenType.php 2015-10-26 09:46:53.591010193 +0100 | |
@@ -227,9 +227,9 @@ | |
$result[] = $converter->convertItem($form->getData()); | |
} | |
- $vars['attr'] = [ | |
- 'data-selected-data' => json_encode($result) | |
- ]; | |
+// $vars['attr'] = [ | |
+// 'data-selected-data' => json_encode($result) | |
+// ]; | |
} | |
$view->vars = array_replace_recursive($view->vars, $vars); | |
diff -urN vendor-original/oro/platform/src/Oro/Bundle/FormBundle/Resources/views/Form/fields.html.twig vendor/oro/platform/src/Oro/Bundle/FormBundle/Resources/views/Form/fields.html.twig | |
--- vendor-original/oro/platform/src/Oro/Bundle/FormBundle/Resources/views/Form/fields.html.twig 2015-10-26 09:45:05.106415609 +0100 | |
+++ vendor/oro/platform/src/Oro/Bundle/FormBundle/Resources/views/Form/fields.html.twig 2015-10-26 09:50:05.712796197 +0100 | |
@@ -1,7 +1,9 @@ | |
{% extends 'OroUIBundle:Form:fields.html.twig' %} | |
{% block genemu_jqueryselect2_widget %} | |
- {% if configs.grid is defined and configs.grid.name is defined %} | |
+ {% if configs.route_parameters.url is defined %} | |
+ {% set url = path(configs.route_parameters.url) %} | |
+ {% else if configs.grid is defined and configs.grid.name is defined %} | |
{% set url = path('oro_datagrid_index', {'gridName': configs.grid.name}) %} | |
{% elseif configs.route_name is defined and configs.route_name %} | |
{% set url = path(configs.route_name, configs.route_parameters | default([])) %} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment