1 files changed, 12 insertions, 12 deletions

diff --git a/app/Controller/Category.php b/app/Controller/Category.php
index 4aefd9fe..258a3b78 100644
--- a/app/Controller/Category.php
+++ b/app/Controller/Category.php
@@ -22,7 +22,7 @@ class Category extends Base
         $category = $this->category->getById($this->request->getIntegerParam('category_id'));
 
         if (empty($category)) {
-            $this->session->flashError(t('Category not found.'));
+            $this->flash->failure(t('Category not found.'));
             $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project_id)));
         }
 
@@ -38,7 +38,7 @@ class Category extends Base
     {
         $project = $this->getProject();
 
-        $this->response->html($this->projectLayout('category/index', array(
+        $this->response->html($this->helper->layout->project('category/index', array(
             'categories' => $this->category->getList($project['id'], false),
             'values' => $values + array('project_id' => $project['id']),
             'errors' => $errors,
@@ -57,14 +57,14 @@ class Category extends Base
         $project = $this->getProject();
 
         $values = $this->request->getValues();
-        list($valid, $errors) = $this->category->validateCreation($values);
+        list($valid, $errors) = $this->categoryValidator->validateCreation($values);
 
         if ($valid) {
             if ($this->category->create($values)) {
-                $this->session->flash(t('Your category have been created successfully.'));
+                $this->flash->success(t('Your category have been created successfully.'));
                 $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
             } else {
-                $this->session->flashError(t('Unable to create your category.'));
+                $this->flash->failure(t('Unable to create your category.'));
             }
         }
 
@@ -81,7 +81,7 @@ class Category extends Base
         $project = $this->getProject();
         $category = $this->getCategory($project['id']);
 
-        $this->response->html($this->projectLayout('category/edit', array(
+        $this->response->html($this->helper->layout->project('category/edit', array(
             'values' => empty($values) ? $category : $values,
             'errors' => $errors,
             'project' => $project,
@@ -99,14 +99,14 @@ class Category extends Base
         $project = $this->getProject();
 
         $values = $this->request->getValues();
-        list($valid, $errors) = $this->category->validateModification($values);
+        list($valid, $errors) = $this->categoryValidator->validateModification($values);
 
         if ($valid) {
             if ($this->category->update($values)) {
-                $this->session->flash(t('Your category have been updated successfully.'));
+                $this->flash->success(t('Your category have been updated successfully.'));
                 $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
             } else {
-                $this->session->flashError(t('Unable to update your category.'));
+                $this->flash->failure(t('Unable to update your category.'));
             }
         }
 
@@ -123,7 +123,7 @@ class Category extends Base
         $project = $this->getProject();
         $category = $this->getCategory($project['id']);
 
-        $this->response->html($this->projectLayout('category/remove', array(
+        $this->response->html($this->helper->layout->project('category/remove', array(
             'project' => $project,
             'category' => $category,
             'title' => t('Remove a category')
@@ -142,9 +142,9 @@ class Category extends Base
         $category = $this->getCategory($project['id']);
 
         if ($this->category->remove($category['id'])) {
-            $this->session->flash(t('Category removed successfully.'));
+            $this->flash->success(t('Category removed successfully.'));
         } else {
-            $this->session->flashError(t('Unable to remove this category.'));
+            $this->flash->failure(t('Unable to remove this category.'));
         }
 
         $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));