From b9575432fd9fb65b331db2ae202c2ef74577efca Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Mon, 10 Feb 2014 11:49:52 +0100
Subject: [PATCH] allow intl for image object

---
 .../Controller/Admin/CouponController.php     |  5 ++-
 .../Controller/Admin/FileController.php       |  3 ++
 .../Event/Image/ImageCreateOrUpdateEvent.php  | 22 +++++++++++++
 .../Thelia/Form/Image/ImageModification.php   |  6 ++++
 templates/backOffice/default/image-edit.html  | 31 ++++++++++++-------
 5 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php
index 442081527..b5f303ff6 100644
--- a/core/lib/Thelia/Controller/Admin/CouponController.php
+++ b/core/lib/Thelia/Controller/Admin/CouponController.php
@@ -98,9 +98,8 @@ class CouponController extends BaseAdminController
     {
         $this->checkAuth(AdminResources::COUPON, array(), AccessManager::VIEW);
 
-        // Database request repeated in the loop but cached
-        $search = CouponQuery::create();
-        $coupon = $search->findOneById($couponId);
+
+        $coupon = CouponQuery::create()->findPk($couponId);
 
         if ($coupon === null) {
             return $this->pageNotFound();
diff --git a/core/lib/Thelia/Controller/Admin/FileController.php b/core/lib/Thelia/Controller/Admin/FileController.php
index 95936df28..d7b46c5be 100644
--- a/core/lib/Thelia/Controller/Admin/FileController.php
+++ b/core/lib/Thelia/Controller/Admin/FileController.php
@@ -823,6 +823,7 @@ class FileController extends BaseAdminController
     protected function createImageEventInstance($parentType, $model, $data)
     {
         $imageCreateEvent = new ImageCreateOrUpdateEvent($parentType, null);
+        $model->setLocale($data['locale']);
 
         if (isset($data['title'])) {
             $model->setTitle($data['title']);
@@ -840,6 +841,8 @@ class FileController extends BaseAdminController
             $model->setPostscriptum($data['postscriptum']);
         }
 
+
+
         $imageCreateEvent->setModelImage($model);
 
         return $imageCreateEvent;
diff --git a/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php
index ea870dd14..0153688a4 100644
--- a/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php
@@ -57,6 +57,8 @@ class ImageCreateOrUpdateEvent extends ActionEvent
     /** @var string Parent name */
     protected $parentName = null;
 
+    protected $locale;
+
     /**
      * Constructor
      *
@@ -70,6 +72,26 @@ class ImageCreateOrUpdateEvent extends ActionEvent
         $this->parentId  = $parentId;
     }
 
+    /**
+     * @param mixed $locale
+     */
+    public function setLocale($locale)
+    {
+        $this->locale = $locale;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getLocale()
+    {
+        return $this->locale;
+    }
+
+
+
     /**
      * Set Image to save
      *
diff --git a/core/lib/Thelia/Form/Image/ImageModification.php b/core/lib/Thelia/Form/Image/ImageModification.php
index 368f82410..93b8f9898 100644
--- a/core/lib/Thelia/Form/Image/ImageModification.php
+++ b/core/lib/Thelia/Form/Image/ImageModification.php
@@ -130,6 +130,12 @@ abstract class ImageModification extends BaseForm
                     )
                 )
             )
+            ->add("locale", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label_attr" => array("for" => "locale_create")
+            ))
         ;
     }
 }
diff --git a/templates/backOffice/default/image-edit.html b/templates/backOffice/default/image-edit.html
index 77d4633e9..b65c6707d 100644
--- a/templates/backOffice/default/image-edit.html
+++ b/templates/backOffice/default/image-edit.html
@@ -30,13 +30,13 @@
 
         						    {form name="$formId"}
         						    	<form method="POST" action="{url path="/admin/image/type/{$imageType}/{$ID}/update"}" {form_enctype form=$form} class="clearfix">
+                                            {include
+                                                file = "includes/inner-form-toolbar.html"
+                                                hide_submit_buttons = false
 
-                                            <div class="row inner-toolbar clearfix">
-                                                <div class="col-md-6 inner-actions pull-right">
-                                                    <a href="{url path="{$redirectUrl}"}" class="btn btn-default btn-info">{intl l='Back'} <span class="glyphicon glyphicon-remove"></span></a>
-                                                    <button type="submit" name="save_mode" value="stay" class="btn btn-default btn-primary" title="{intl l='Save'}">{intl l='Save'} <span class="glyphicon glyphicon-ok"></span></button>
-                                                </div>
-                                            </div>
+                                                page_url  = "{url path="/admin/image/type/{$imageType}/{$ID}/update"}"
+                                                close_url = "{url path="{$redirectUrl}"}"
+                                            }
 
         						        	{form_hidden_fields form=$form}
 
@@ -44,6 +44,10 @@
         						        		<input type="hidden" name="{$name}" value="{url path="/admin/image/type/{$imageType}/{$ID}/update"}" />
         						        	{/form_field}
 
+                                            {form_field form=$form field='locale'}
+                                                <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
+                                            {/form_field}
+
         					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 
                                             <p class="title title-without-tabs">{intl l="Image information"}</p>
@@ -101,12 +105,15 @@
                                                 </div>
                                             </div>
 
-                                            <div class="row inner-toolbar clearfix">
-                                                <div class="col-md-6 inner-actions pull-right">
-                                                    <a href="{url path="{$redirectUrl}"}" class="btn btn-default btn-info">{intl l='Back'} <span class="glyphicon glyphicon-remove"></span></a>
-                                                    <button type="submit" name="save_mode" value="stay" class="btn btn-default btn-primary" title="{intl l='Save'}">{intl l='Save'} <span class="glyphicon glyphicon-ok"></span></button>
-                                                </div>
-                                            </div>
+                                            {include
+                                                file = "includes/inner-form-toolbar.html"
+                                                hide_submit_buttons = false
+                                                hide_flags = true
+
+                                                page_url  = "{url path="/admin/image/type/{$imageType}/{$ID}/update"}"
+                                                close_url = "{url path="{$redirectUrl}"}"
+                                            }
+
 
                                         </form>
         							{/form}