summaryrefslogtreecommitdiff
path: root/app/Model
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-01-24 20:38:39 -0500
committerFrederic Guillot <fred@kanboard.net>2016-01-24 20:38:39 -0500
commit051bf1c9dbb5733242c7657d6d507389206b33ee (patch)
tree9f1a61fa8558dd572b7c577f51599586e3c48a7e /app/Model
parent60f3d7f83d23014f9cfb7d8494d6cebd2f8b24a3 (diff)
Add configurable task priority
Diffstat (limited to 'app/Model')
-rw-r--r--app/Model/Project.php4
-rw-r--r--app/Model/TaskFinder.php2
-rw-r--r--app/Model/TaskModification.php2
3 files changed, 7 insertions, 1 deletions
diff --git a/app/Model/Project.php b/app/Model/Project.php
index ba0716b0..d0a8bfc8 100644
--- a/app/Model/Project.php
+++ b/app/Model/Project.php
@@ -334,6 +334,8 @@ class Project extends Base
$values['identifier'] = strtoupper($values['identifier']);
}
+ $this->convertIntegerFields($values, array('priority_default', 'priority_start', 'priority_end'));
+
if (! $this->db->table(self::TABLE)->save($values)) {
$this->db->cancelTransaction();
return false;
@@ -400,6 +402,8 @@ class Project extends Base
$values['identifier'] = strtoupper($values['identifier']);
}
+ $this->convertIntegerFields($values, array('priority_default', 'priority_start', 'priority_end'));
+
return $this->exists($values['id']) &&
$this->db->table(self::TABLE)->eq('id', $values['id'])->save($values);
}
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index 836fbe46..1c83136b 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -113,6 +113,7 @@ class TaskFinder extends Base
'tasks.is_active',
'tasks.score',
'tasks.category_id',
+ 'tasks.priority',
'tasks.date_moved',
'tasks.recurrence_status',
'tasks.recurrence_trigger',
@@ -308,6 +309,7 @@ class TaskFinder extends Base
tasks.is_active,
tasks.score,
tasks.category_id,
+ tasks.priority,
tasks.swimlane_id,
tasks.date_moved,
tasks.recurrence_status,
diff --git a/app/Model/TaskModification.php b/app/Model/TaskModification.php
index a0ad292c..eee7b2e0 100644
--- a/app/Model/TaskModification.php
+++ b/app/Model/TaskModification.php
@@ -88,7 +88,7 @@ class TaskModification extends Base
$this->dateParser->convert($values, array('date_started'), true);
$this->removeFields($values, array('another_task', 'id'));
$this->resetFields($values, array('date_due', 'date_started', 'score', 'category_id', 'time_estimated', 'time_spent'));
- $this->convertIntegerFields($values, array('is_active', 'recurrence_status', 'recurrence_trigger', 'recurrence_factor', 'recurrence_timeframe', 'recurrence_basedate'));
+ $this->convertIntegerFields($values, array('priority', 'is_active', 'recurrence_status', 'recurrence_trigger', 'recurrence_factor', 'recurrence_timeframe', 'recurrence_basedate'));
$values['date_modification'] = time();
}