Merge pull-request #2587

2016-08-23 20:24:43 -04:00
parent 4ffb4df5fd 37425d45a6
commit fb24b527f2
11 changed files with 332 additions and 3 deletions
--- a/app/Model/ActionParameterModel.php
+++ b/app/Model/ActionParameterModel.php
@@ -157,7 +157,10 @@ class ActionParameterModel extends Base
            case 'user_id':
            case 'owner_id':
                return $this->projectPermissionModel->isAssignable($project_id, $value) ? $value : false;
-            default:
+            case 'swimlane_id':
+                $column = $this->swimlaneModel->getById($value);
+                return empty($column) ? false : $this->swimlaneModel->getIdByName($project_id, $column['name']) ?: false;
+			default:
                return $value;
        }
    }