Merge pull-request #1178

1 files changed, 14 insertions, 6 deletions

diff --git a/app/Controller/Swimlane.php b/app/Controller/Swimlane.php
index 054fa4ba..02fe8a6e 100644
--- a/app/Controller/Swimlane.php
+++ b/app/Controller/Swimlane.php
@@ -58,16 +58,14 @@ class Swimlane extends Base
      */
     public function save()
     {
-        $project = $this->getProject();
-
         $values = $this->request->getValues();
         list($valid, $errors) = $this->swimlane->validateCreation($values);
 
         if ($valid) {
 
-            if ($this->swimlane->create($project['id'], $values['name'])) {
+            if ($this->swimlane->create($values)) {
                 $this->session->flash(t('Your swimlane have been created successfully.'));
-                $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+                $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $values['project_id'])));
             }
             else {
                 $this->session->flashError(t('Unable to create your swimlane.'));
@@ -134,8 +132,7 @@ class Swimlane extends Base
         list($valid, $errors) = $this->swimlane->validateModification($values);
 
         if ($valid) {
-
-            if ($this->swimlane->rename($values['id'], $values['name'])) {
+            if ($this->swimlane->update($values)) {
                 $this->session->flash(t('Swimlane updated successfully.'));
                 $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
             }
@@ -253,4 +250,15 @@ class Swimlane extends Base
         $this->swimlane->moveDown($project['id'], $swimlane_id);
         $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
     }
+
+    /**
+     * Display swimlane description
+     *
+     * @access public
+     */
+    public function description()
+    {
+        $swimlane = $this->swimlane->getById($this->request->getIntegerParam('swimlane_id'));
+        $this->response->html($this->template->render('board/tooltip_description', array('task' => $swimlane)));
+    }
 }