Merge c7b2c78 into 23ccca2

sonata-project · Jul 12, 2016 · 84f8855 · 84f8855
2 parents 23ccca2 + c7b2c78
commit 84f8855
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 15 deletions.
diff --git a/Admin/Extension/Gedmo/TranslatableAdminExtension.php b/Admin/Extension/Gedmo/TranslatableAdminExtension.php
@@ -13,6 +13,8 @@
 
 use Gedmo\Translatable\TranslatableListener;
 use Sonata\AdminBundle\Admin\AdminInterface;
+use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
+use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
 use Sonata\TranslationBundle\Admin\Extension\AbstractTranslatableAdminExtension;
 use Sonata\TranslationBundle\Checker\TranslatableChecker;
 
@@ -40,13 +42,70 @@ public function alterObject(AdminInterface $admin, $object)
         if ($this->getTranslatableChecker()->isTranslatable($object)) {
             $translatableListener = $this->getTranslatableListener($admin);
             $translatableListener->setTranslatableLocale($this->getTranslatableLocale($admin));
-            $translatableListener->setTranslationFallback('');
+            $translatableListener->setTranslationFallback(false);
 
             $this->getContainer($admin)->get('doctrine')->getManager()->refresh($object);
             $object->setLocale($this->getTranslatableLocale($admin));
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function configureQuery(AdminInterface $admin, ProxyQueryInterface $query, $context = 'list')
+    {
+        $this->getTranslatableListener($admin)->setTranslatableLocale($this->getTranslatableLocale($admin));
+        $this->getTranslatableListener($admin)->setTranslationFallback(false);
+    }
+
+    /**
+     * Search on normal field and on translated field, use with a
+     * doctrine_orm_callback filter type.
+     *
+     * @param ProxyQuery $queryBuilder
+     * @param string     $alias
+     * @param string     $field
+     * @param string     $value
+     *
+     * @return bool|null
+     */
+    public static function translationFieldFilter(ProxyQuery $queryBuilder, $alias, $field, $value)
+    {
+        if (!$value['value']) {
+            return;
+        }
+
+        // verify if the join is not already done
+        $aliasAlreadyExists = false;
+        $joinDqlParts = $queryBuilder->getDQLParts()['join'];
+        foreach ($joinDqlParts as $joins) {
+            foreach ($joins as $join) {
+                if ($join->getAlias() === 't') {
+                    $aliasAlreadyExists = true;
+                    break 2;
+                }
+            }
+        }
+
+        if (!$aliasAlreadyExists) {
+            $queryBuilder->leftJoin($alias.'.translations', 't');
+        }
+
+        // search on translation OR on normal field
+        $queryBuilder->andWhere($queryBuilder->expr()->orX(
+            $queryBuilder->expr()->andX(
+                $queryBuilder->expr()->eq('t.field', $queryBuilder->expr()->literal($field)),
+                $queryBuilder->expr()->like('t.content', $queryBuilder->expr()->literal('%'.$value['value'].'%'))
+            ),
+            $queryBuilder->expr()->like(
+                sprintf('%s.%s', $alias, $field),
+                $queryBuilder->expr()->literal('%'.$value['value'].'%')
+            )
+        ));
+
+        return true;
+    }
+
     /**
      * @param AdminInterface $admin Deprecated, set TranslatableListener in the constructor instead.
      *

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.0 (unreleased)
+### Added
+- [gedmo translations] Added content language switcher to lists
+- [gedmo translations] Added available translations filter
+
 ## [2.0.2](https://github.com/sonata-project/SonataTranslationBundle/compare/2.0.1...2.0.2) - 2016-06-15
 ### Fixed
 - Remove wrong `doctrine-orm-admin-bundle` and `doctrine-phpcr-admin-bundle` composer requirements

diff --git a/EventListener/LocaleSwitcherListener.php b/EventListener/LocaleSwitcherListener.php
@@ -28,6 +28,9 @@ public function onBlock(BlockEvent $event, $eventName)
         if ($eventName == 'sonata.block.event.sonata.admin.show.top') {
             $settings['locale_switcher_route'] = 'show';
         }
+        if ($eventName == 'sonata.block.event.sonata.admin.list.table.top') {
+            $settings['locale_switcher_route'] = 'list';
+        }
 
         $block = new Block();
         $block->setSettings($settings);

diff --git a/Resources/config/listener.xml b/Resources/config/listener.xml
@@ -7,6 +7,7 @@
         <service id="sonata_translation.listener.locale_switcher" class="%sonata_translation.listener.locale_switcher.class%">
             <tag name="kernel.event_listener" event="sonata.block.event.sonata.admin.edit.form.top" method="onBlock"/>
             <tag name="kernel.event_listener" event="sonata.block.event.sonata.admin.show.top" method="onBlock"/>
+            <tag name="kernel.event_listener" event="sonata.block.event.sonata.admin.list.table.top" method="onBlock"/>
         </service>
     </services>
 </container>
diff --git a/Resources/public/css/sonata-translation.css b/Resources/public/css/sonata-translation.css
@@ -2,75 +2,96 @@
  * SonataTranslation: adds translations to your forms
  */
 .sonata-bc .sonata-ba-form .locale_switcher,
-.sonata-bc .sonata-ba-show .locale_switcher {
+.sonata-bc .sonata-ba-show .locale_switcher,
+.sonata-bc .box-primary .locale_switcher {
   padding: 1px 0 0 0;
   text-align: right;
   margin-right: 15px;
   margin-bottom: 5px;
   float: right;
 }
 .sonata-bc .sonata-ba-form .locale_switcher a,
-.sonata-bc .sonata-ba-show .locale_switcher a {
+.sonata-bc .sonata-ba-show .locale_switcher a,
+.sonata-bc .box-primary .locale_switcher a {
   margin-right: 0;
   padding: 2px;
   opacity: 0.5;
 }
 .sonata-bc .sonata-ba-form .locale_switcher a.active,
-.sonata-bc .sonata-ba-show .locale_switcher a.active {
+.sonata-bc .sonata-ba-show .locale_switcher a.active,
+.sonata-bc .box-primary .locale_switcher a.active {
   opacity: 1;
 }
 .sonata-bc .sonata-ba-form .locale_switcher a:hover,
-.sonata-bc .sonata-ba-show .locale_switcher a:hover {
+.sonata-bc .sonata-ba-show .locale_switcher a:hover,
+.sonata-bc .box-primary .locale_switcher a:hover {
   opacity: 1;
 }
 .sonata-bc .sonata-ba-form label.wysiwyg.locale,
 .sonata-bc .sonata-ba-show label.wysiwyg.locale,
+.sonata-bc .box-primary label.wysiwyg.locale,
 .sonata-bc .sonata-ba-form label.checkbox.locale,
 .sonata-bc .sonata-ba-show label.checkbox.locale,
+.sonata-bc .box-primary label.checkbox.locale,
 .sonata-bc .sonata-ba-form input.locale,
 .sonata-bc .sonata-ba-show input.locale,
+.sonata-bc .box-primary input.locale,
 .sonata-bc .sonata-ba-form textarea.locale,
 .sonata-bc .sonata-ba-show textarea.locale,
+.sonata-bc .box-primary textarea.locale,
 .sonata-bc .sonata-ba-form select.locale,
 .sonata-bc .sonata-ba-show select.locale,
+.sonata-bc .box-primary select.locale,
 .sonata-bc .sonata-ba-form li.locale a,
-.sonata-bc .sonata-ba-show li.locale a {
+.sonata-bc .sonata-ba-show li.locale a,
+.sonata-bc .box-primary li.locale a {
   background-repeat: no-repeat;
 }
 .sonata-bc .sonata-ba-form input[type="text"].locale,
 .sonata-bc .sonata-ba-show input[type="text"].locale,
+.sonata-bc .box-primary input[type="text"].locale,
 .sonata-bc .sonata-ba-form select.locale,
-.sonata-bc .sonata-ba-show select.locale {
+.sonata-bc .sonata-ba-show select.locale,
+.sonata-bc .box-primary select.locale {
   padding-left: 35px !important;
   background-position: 5px center;
 }
 .sonata-bc .sonata-ba-form textarea.locale,
-.sonata-bc .sonata-ba-show textarea.locale {
+.sonata-bc .sonata-ba-show textarea.locale,
+.sonata-bc .box-primary textarea.locale {
   padding-left: 35px;
   background-position: 5px 5px;
 }
 .sonata-bc .sonata-ba-form label.wysiwyg.locale,
 .sonata-bc .sonata-ba-show label.wysiwyg.locale,
+.sonata-bc .box-primary label.wysiwyg.locale,
 .sonata-bc .sonata-ba-form label.checkbox.locale,
-.sonata-bc .sonata-ba-show label.checkbox.locale {
+.sonata-bc .sonata-ba-show label.checkbox.locale,
+.sonata-bc .box-primary label.checkbox.locale {
   padding-right: 35px;
   background-position: right bottom;
 }
 .sonata-bc .sonata-ba-form .form-horizontal .controls input[type="checkbox"],
-.sonata-bc .sonata-ba-show .form-horizontal .controls input[type="checkbox"] {
+.sonata-bc .sonata-ba-show .form-horizontal .controls input[type="checkbox"],
+.sonata-bc .box-primary .form-horizontal .controls input[type="checkbox"] {
   /*top: 5px;*/
   position: relative;
   width: 15px;
 }
 .sonata-bc .sonata-ba-form .form-horizontal .controls input[type="checkbox"].locale,
-.sonata-bc .sonata-ba-show .form-horizontal .controls input[type="checkbox"].locale {
+.sonata-bc .sonata-ba-show .form-horizontal .controls input[type="checkbox"].locale,
+.sonata-bc .box-primary .form-horizontal .controls input[type="checkbox"].locale {
   width: 65px;
   background-position: 0 center;
 }
 .sonata-bc .sonata-ba-form .form-horizontal .controls input[type="checkbox"]:before,
-.sonata-bc .sonata-ba-show .form-horizontal .controls input[type="checkbox"]:before {
+.sonata-bc .sonata-ba-show .form-horizontal .controls input[type="checkbox"]:before,
+.sonata-bc .box-primary .form-horizontal .controls input[type="checkbox"]:before {
   margin-right: 35px;
 }
+.sonata-bc .sonata-ba-show .locale_switcher {
+  margin-right: 15px;
+}
 .sonata-bc.locale_nl label.wysiwyg.locale,
 .sonata-bc.locale_nl label.checkbox.locale,
 .sonata-bc.locale_nl input.locale,

diff --git a/Resources/public/less/sonata-translation.less b/Resources/public/less/sonata-translation.less
@@ -3,7 +3,7 @@
  */
 .sonata-bc {
 
-    .sonata-ba-form, .sonata-ba-show {
+    .sonata-ba-form, .sonata-ba-show, .box-primary {
         .locale_switcher {
             padding: 1px 0 0 0;
             text-align: right;

diff --git a/Resources/views/Block/block_locale_switcher.html.twig b/Resources/views/Block/block_locale_switcher.html.twig
@@ -2,8 +2,15 @@
 {% set admin  = block_context.settings.admin %}
 {% set locale_switcher_route = block_context.settings.locale_switcher_route %}
 {% set locale_switcher_route_parameters = block_context.settings.locale_switcher_route_parameters %}
+{% set currentLocale = object.locale %}
+
+{% if (admin.class is translatable) %}
+    {% for extension in admin.extensions %}
+        {% if (extension.translatableLocale is defined) %}
+            {% set currentLocale = extension.translatableLocale(admin) %}
+        {% endif %}
+    {% endfor %}
 
-{% if (object is translatable) %}
     <div class="locale_switcher">
         {% spaceless %}
             {% for locale in sonata_translation_locales %}
@@ -19,7 +26,7 @@
                         {'id': admin.id(object), 'tl': locale}|merge(locale_switcher_route_parameters)
                     ) }}"
                    accesskey=""
-                   class=" {% if (object.locale == locale) %} active {% endif %}"
+                   class=" {% if (currentLocale == locale) %} active {% endif %}"
                    title="{{ 'admin.locale_switcher.tooltip' |trans([], 'SonataTranslationBundle') }}">
                     <img src="{{ asset('bundles/sonatatranslation/img/flags/' ~ locale ~ '.png')}}" />
                 </a>