From 52b9899fc564f7fce572790ede5e59b30b09875c Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 26 Nov 2014 21:30:21 -0500
Subject: Remove some code duplication

---
 app/Controller/Category.php    | 27 ++++++++-------------------
 app/Template/category/edit.php |  2 +-
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/app/Controller/Category.php b/app/Controller/Category.php
index d69ed115..27c0d9fc 100644
--- a/app/Controller/Category.php
+++ b/app/Controller/Category.php
@@ -34,14 +34,14 @@ class Category extends Base
      *
      * @access public
      */
-    public function index()
+    public function index(array $values = array(), array $errors = array())
     {
         $project = $this->getProjectManagement();
 
         $this->response->html($this->projectLayout('category/index', array(
             'categories' => $this->category->getList($project['id'], false),
-            'values' => array('project_id' => $project['id']),
-            'errors' => array(),
+            'values' => $values + array('project_id' => $project['id']),
+            'errors' => $errors,
             'project' => $project,
             'title' => t('Categories')
         )));
@@ -70,13 +70,7 @@ class Category extends Base
             }
         }
 
-        $this->response->html($this->projectLayout('category/index', array(
-            'categories' => $this->category->getList($project['id'], false),
-            'values' => $values,
-            'errors' => $errors,
-            'project' => $project,
-            'title' => t('Categories')
-        )));
+        $this->index($values, $errors);
     }
 
     /**
@@ -84,14 +78,14 @@ class Category extends Base
      *
      * @access public
      */
-    public function edit()
+    public function edit(array $values = array(), array $errors = array())
     {
         $project = $this->getProjectManagement();
         $category = $this->getCategory($project['id']);
 
         $this->response->html($this->projectLayout('category/edit', array(
-            'values' => $category,
-            'errors' => array(),
+            'values' => empty($values) ? $category : $values,
+            'errors' => $errors,
             'project' => $project,
             'title' => t('Categories')
         )));
@@ -120,12 +114,7 @@ class Category extends Base
             }
         }
 
-        $this->response->html($this->projectLayout('category/edit', array(
-            'values' => $values,
-            'errors' => $errors,
-            'project' => $project,
-            'title' => t('Categories')
-        )));
+        $this->edit($values, $errors);
     }
 
     /**
diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
index 05fe288a..66cf429b 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form method="post" action="<?= Helper\u('category', 'update', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= Helper\u('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
 
     <?= Helper\form_csrf() ?>
 
-- 
cgit v1.2.3