Merge pull request #11 from lopes-vincent/master

Add fix for Thelia 2.4
thelia-modules · Feb 5, 2019 · f370cbb · f370cbb
2 parents 75c5ffc + f82e1b2
commit f370cbb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -16,7 +16,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <author>
         <name>Gilles Bourgeat</name>
         <email>gilles.bourgeat@gmail.com</email>

diff --git a/I18n/backOffice/default/fr_FR.php b/I18n/backOffice/default/fr_FR.php
@@ -50,7 +50,7 @@
     'Slug' => 'Slug',
     'Step applied to the input field' => 'Etape appliquée sur le champ',
     'The data of the form have been modified, do not forget to validate these modifications !!!' => 'Les données du formulaire ont été modifiées, n\'oubliez pas de valider ces modifications !!!',
-    'The data of the form have been modified, if you continue without having validate your modifications all will be lost. Continue ?' => 'The data of the form have been modified, if you continue without having validate your modifications all will be lost. Continue ?\' => \'Les données du formulaire ont été modifiées, si vous continuez sans avoir valider vos modification tout sera perdu. Continuer ?',
+    'The data of the form have been modified, if you continue without having validate your modifications all will be lost. Continue ?' => 'Les données du formulaire ont été modifiées, si vous continuez sans avoir valider vos modification tout sera perdu. Continuer ?',
     'The values will be unique for each language' => 'Les valeurs sont uniques par langue',
     'Title' => 'Titre',
     'To ask for help' => 'Pour demander de l\'aide',

diff --git a/Loop/AttributeTypeLoop.php b/Loop/AttributeTypeLoop.php
@@ -124,8 +124,6 @@ public function buildModelCriteria()
                     null,
                     \PDO::PARAM_INT
                 );
-
-            $query->addJoinObject($join);
         }
 
         foreach ($this->getOrder() as $order) {

diff --git a/templates/backOffice/default/attribute-type/include/form-generic.html b/templates/backOffice/default/attribute-type/include/form-generic.html
@@ -167,7 +167,6 @@
         {/form_field}
       </div>
     </div>
-  </div>
 
   {hook name="attribute-type.form-bottom" attribute_type_id=$attribute_type_id}