1 files changed, 7 insertions, 23 deletions

diff --git a/app/Controller/Currency.php b/app/Controller/Currency.php
index 9d6b0249..ecaa9834 100644
--- a/app/Controller/Currency.php
+++ b/app/Controller/Currency.php
@@ -11,34 +11,18 @@ namespace Kanboard\Controller;
 class Currency extends Base
 {
     /**
-     * Common layout for config views
-     *
-     * @access private
-     * @param  string    $template   Template name
-     * @param  array     $params     Template parameters
-     * @return string
-     */
-    private function layout($template, array $params)
-    {
-        $params['board_selector'] = $this->projectPermission->getAllowedProjects($this->userSession->getId());
-        $params['config_content_for_layout'] = $this->template->render($template, $params);
-
-        return $this->template->layout('config/layout', $params);
-    }
-
-    /**
      * Display all currency rates and form
      *
      * @access public
      */
     public function index(array $values = array(), array $errors = array())
     {
-        $this->response->html($this->layout('currency/index', array(
+        $this->response->html($this->helper->layout->config('currency/index', array(
             'config_values' => array('application_currency' => $this->config->get('application_currency')),
             'values' => $values,
             'errors' => $errors,
             'rates' => $this->currency->getAll(),
-            'currencies' => $this->config->getCurrencies(),
+            'currencies' => $this->currency->getCurrencies(),
             'title' => t('Settings').' > '.t('Currency rates'),
         )));
     }
@@ -51,14 +35,14 @@ class Currency extends Base
     public function create()
     {
         $values = $this->request->getValues();
-        list($valid, $errors) = $this->currency->validate($values);
+        list($valid, $errors) = $this->currencyValidator->validateCreation($values);
 
         if ($valid) {
             if ($this->currency->create($values['currency'], $values['rate'])) {
-                $this->session->flash(t('The currency rate have been added successfully.'));
+                $this->flash->success(t('The currency rate have been added successfully.'));
                 $this->response->redirect($this->helper->url->to('currency', 'index'));
             } else {
-                $this->session->flashError(t('Unable to add this currency rate.'));
+                $this->flash->failure(t('Unable to add this currency rate.'));
             }
         }
 
@@ -76,9 +60,9 @@ class Currency extends Base
 
         if ($this->config->save($values)) {
             $this->config->reload();
-            $this->session->flash(t('Settings saved successfully.'));
+            $this->flash->success(t('Settings saved successfully.'));
         } else {
-            $this->session->flashError(t('Unable to save your settings.'));
+            $this->flash->failure(t('Unable to save your settings.'));
         }
 
         $this->response->redirect($this->helper->url->to('currency', 'index'));