2 files changed, 143 insertions, 0 deletions
diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index 5851bd26..840db05b 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -52,6 +52,7 @@ class Board extends Base
         $this->response->html($this->template->layout('board/view_private', array(
             'categories_list' => $this->category->getList($params['project']['id'], false),
             'users_list' => $this->projectPermission->getMemberList($params['project']['id'], false),
+            'custom_filters_list' => $this->customFilter->getAll($params['project']['id'], $this->userSession->getId()),
             'swimlanes' => $this->taskFilter->search($params['filters']['search'])->getBoard($params['project']['id']),
             'description' => $params['project']['description'],
             'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
diff --git a/app/Controller/Customfilter.php b/app/Controller/Customfilter.php
new file mode 100644
index 00000000..c403cb4b
--- /dev/null
+++ b/app/Controller/Customfilter.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Controller;
+
+/**
+ * Custom Filter management
+ *
+ * @package controller
+ * @author  Timo Litzbarski
+ */
+class Customfilter extends Base
+{
+    /**
+     * Display list of filters
+     *
+     * @access public
+     */
+    public function index(array $values = array(), array $errors = array())
+    {
+        $project = $this->getProject();
+
+        $this->response->html($this->projectLayout('custom_filter/index', array(
+            'values' => $values + array('project_id' => $project['id']),
+            'errors' => $errors,
+            'project' => $project,
+            'custom_filters' => $this->customFilter->getAll($project['id'], $this->userSession->getId()),
+            'title' => t('Custom filters'),
+        )));
+    }
+
+    /**
+     * Save a new custom filter
+     *
+     * @access public
+     */
+    public function save()
+    {
+        $project = $this->getProject();
+
+        $values = $this->request->getValues();
+        $values['user_id'] = $this->userSession->getId();
+
+        list($valid, $errors) = $this->customFilter->validateCreation($values);
+
+        if ($valid) {
+            if ($this->customFilter->create($values)) {
+                $this->session->flash(t('Your custom filter have been created successfully.'));
+                $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
+            }
+            else {
+                $this->session->flashError(t('Unable to create your custom filter.'));
+            }
+        }
+
+        $this->index($values, $errors);
+    }
+
+    /**
+     * Remove a custom filter
+     *
+     * @access public
+     */
+    public function remove()
+    {
+        $this->checkCSRFParam();
+        $project = $this->getProject();
+        $filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id'));
+
+        $this->checkPermission($project, $filter);
+
+        if ($this->customFilter->remove($filter['id'])) {
+            $this->session->flash(t('Custom filter removed successfully.'));
+        } else {
+            $this->session->flashError(t('Unable to remove this custom filter.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
+    }
+
+    /**
+     * Edit a custom filter (display the form)
+     *
+     * @access public
+     */
+    public function edit(array $values = array(), array $errors = array())
+    {
+        $project = $this->getProject();
+        $filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id'));
+
+        $this->checkPermission($project, $filter);
+
+        $this->response->html($this->projectLayout('custom_filter/edit', array(
+            'values' => empty($values) ? $filter : $values,
+            'errors' => $errors,
+            'project' => $project,
+            'filter' => $filter,
+            'title' => t('Edit custom filter')
+        )));
+    }
+
+    /**
+     * Edit a custom filter (validate the form and update the database)
+     *
+     * @access public
+     */
+    public function update()
+    {
+        $project = $this->getProject();
+        $filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id'));
+
+        $this->checkPermission($project, $filter);
+
+        $values = $this->request->getValues();
+
+        if (! isset($values['is_shared'])) {
+            $values += array('is_shared' => 0);
+        }
+
+        list($valid, $errors) = $this->customFilter->validateModification($values);
+
+        if ($valid) {
+            if ($this->customFilter->update($values)) {
+                $this->session->flash(t('Your custom filter have been updated successfully.'));
+                $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
+            }
+            else {
+                $this->session->flashError(t('Unable to update custom filter.'));
+            }
+        }
+
+        $this->edit($values, $errors);
+    }
+
+    private function checkPermission(array $project, array $filter)
+    {
+        $user_id = $this->userSession->getId();
+
+        if ($filter['user_id'] != $user_id && (! $this->projectPermission->isManager($project['id'], $user_id) || ! $this->userSession->isAdmin())) {
+            $this->forbidden();
+        }
+    }
+}