Added AdminUtilities Smarty plugin, optimized templates

core/lib/Thelia/Controller/Admin/BaseAdminController.php

@@ -155,7 +155,7 @@ class BaseAdminController extends BaseController
      */
     protected function getCurrentEditionLangId() {
         return $this->getRequest()->get(
-                'edition_language',
+                'edit_language_id',
                 $this->getSession()->getAdminEditionLangId()
         );
     }
@@ -196,29 +196,32 @@ class BaseAdminController extends BaseController
 
         $session = $this->getSession();
 
-        // Find the current edit language ID
         $edition_language = $this->getCurrentEditionLangId();
 
         // Current back-office (not edition) language
-        $current_lang = LangQuery::create()->findOneById($session->getLangId());
+        $current_lang     = LangQuery::create()->findOneById($session->getLangId());
+
+        // Find the current edit language ID
+        $edition_language = LangQuery::create()->findOneById($this->getCurrentEditionLangId());
 
         // Prepare common template variables
         $args = array_merge($args, array(
-            'locale'           => $session->getLocale(),
-            'lang_code'        => $session->getLang(),
-            'lang_id'          => $session->getLangId(),
+            'locale'               => $session->getLocale(),
+            'lang_code'            => $session->getLang(),
+            'lang_id'              => $session->getLangId(),
 
-            'datetime_format'  => $current_lang->getDateTimeFormat(),
-            'date_format'      => $current_lang->getDateFormat(),
-            'time_format'      => $current_lang->getTimeFormat(),
+            'datetime_format'      => $current_lang->getDateTimeFormat(),
+            'date_format'          => $current_lang->getDateFormat(),
+            'time_format'          => $current_lang->getTimeFormat(),
 
-            'edition_language' => $edition_language,
+            'edit_language_id'     => $edition_language->getId(),
+            'edit_language_locale' => $edition_language->getLocale(),
 
-            'current_url'      => htmlspecialchars($this->getRequest()->getUri())
+            'current_url'          => htmlspecialchars($this->getRequest()->getUri())
         ));
 
         // Update the current edition language in session
-        $this->getSession()->setAdminEditionLangId($edition_language);
+        $this->getSession()->setAdminEditionLangId($edition_language->getId());
 
         // Render the template.
         try {

core/lib/Thelia/Controller/Admin/CategoryController.php

@@ -188,7 +188,7 @@ class CategoryController extends BaseAdminController
 
         // Find the current order
         $category_order = $this->getRequest()->get(
-                'category_order',
+                'order',
                 $this->getSession()->get('admin.category_order', 'manual')
         );
 

core/lib/Thelia/Controller/Admin/ConfigController.php

@@ -42,6 +42,25 @@ use Thelia\Form\ConfigCreationForm;
  */
 class ConfigController extends BaseAdminController
 {
+    /**
+     * Render the currencies list, ensuring the sort order is set.
+     *
+     * @return Symfony\Component\HttpFoundation\Response the response
+     */
+    protected function renderList() {
+
+        // Find the current order
+        $order = $this->getRequest()->get(
+                'order',
+                $this->getSession()->get('admin.variables_order', 'name')
+        );
+
+        // Store the current sort order in session
+        $this->getSession()->set('admin.variables_order', $order);
+
+        return $this->render('variables', array('order' => $order));
+    }
+
     /**
      * The default action is displaying the variables list.
      *
@@ -51,7 +70,7 @@ class ConfigController extends BaseAdminController
 
         if (null !== $response = $this->checkAuth("admin.configuration.variables.view")) return $response;
 
-        return $this->render('variables');
+        return $this->renderList();
     }
 
     /**
@@ -124,7 +143,7 @@ class ConfigController extends BaseAdminController
         }
 
         // At this point, the form has error, and should be redisplayed.
-        return $this->render('variables');
+        return $this->renderList();
     }
 
     /**
@@ -276,7 +295,7 @@ class ConfigController extends BaseAdminController
             $this->dispatch(TheliaEvents::CONFIG_SETVALUE, $event);
         }
 
-        $this->redirect(URL::adminViewUrl('variables'));
+        $this->redirect(URL::absoluteUrl('/admin/configuration/variables'));
     }
 
     /**
@@ -294,6 +313,6 @@ class ConfigController extends BaseAdminController
 
         $this->dispatch(TheliaEvents::CONFIG_DELETE, $event);
 
-        $this->redirect(URL::adminViewUrl('variables'));
+        $this->redirect(URL::absoluteUrl('/admin/configuration/variables'));
     }
 }

core/lib/Thelia/Controller/Admin/CurrencyController.php

@@ -101,7 +101,9 @@ class CurrencyController extends BaseAdminController
                 ->setCurrencyName($data['name'])
                 ->setLocale($data["locale"])
                 ->setSymbol($data['symbol'])
-                ;
+                ->setCode($data['code'])
+                ->setRate($data['rate'])
+            ;
 
             $this->dispatch(TheliaEvents::CURRENCY_CREATE, $createEvent);