summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Action/Base.php1
-rw-r--r--app/Action/TaskAssignCategoryColor.php2
-rw-r--r--app/Action/TaskAssignCategoryLabel.php2
-rw-r--r--app/Action/TaskAssignColorCategory.php2
-rw-r--r--app/Action/TaskAssignColorUser.php2
-rw-r--r--app/Action/TaskAssignCurrentUser.php2
-rw-r--r--app/Action/TaskAssignSpecificUser.php2
-rw-r--r--app/Action/TaskAssignUser.php2
-rw-r--r--app/Controller/Base.php1
-rw-r--r--app/Controller/Board.php4
-rw-r--r--app/Controller/Task.php6
-rw-r--r--app/Model/Task.php83
-rw-r--r--app/Model/TaskModification.php73
-rw-r--r--app/Model/TaskPosition.php8
14 files changed, 95 insertions, 95 deletions
diff --git a/app/Action/Base.php b/app/Action/Base.php
index c8c589c1..b7255371 100644
--- a/app/Action/Base.php
+++ b/app/Action/Base.php
@@ -16,6 +16,7 @@ use Core\Tool;
* @property \Model\Comment $comment
* @property \Model\Task $task
* @property \Model\TaskCreation $taskCreation
+ * @property \Model\TaskModification $taskModification
* @property \Model\TaskFinder $taskFinder
* @property \Model\TaskStatus $taskStatus
*/
diff --git a/app/Action/TaskAssignCategoryColor.php b/app/Action/TaskAssignCategoryColor.php
index be15f659..4134b584 100644
--- a/app/Action/TaskAssignCategoryColor.php
+++ b/app/Action/TaskAssignCategoryColor.php
@@ -67,7 +67,7 @@ class TaskAssignCategoryColor extends Base
'category_id' => $this->getParam('category_id'),
);
- return $this->task->update($values, false);
+ return $this->taskModification->update($values, false);
}
/**
diff --git a/app/Action/TaskAssignCategoryLabel.php b/app/Action/TaskAssignCategoryLabel.php
index 5e1b025e..da41a313 100644
--- a/app/Action/TaskAssignCategoryLabel.php
+++ b/app/Action/TaskAssignCategoryLabel.php
@@ -67,7 +67,7 @@ class TaskAssignCategoryLabel extends Base
'category_id' => isset($data['category_id']) ? $data['category_id'] : $this->getParam('category_id'),
);
- return $this->task->update($values, false);
+ return $this->taskModification->update($values, false);
}
/**
diff --git a/app/Action/TaskAssignColorCategory.php b/app/Action/TaskAssignColorCategory.php
index f5a9ac5a..68bca5d0 100644
--- a/app/Action/TaskAssignColorCategory.php
+++ b/app/Action/TaskAssignColorCategory.php
@@ -67,7 +67,7 @@ class TaskAssignColorCategory extends Base
'color_id' => $this->getParam('color_id'),
);
- return $this->task->update($values, false);
+ return $this->taskModification->update($values, false);
}
/**
diff --git a/app/Action/TaskAssignColorUser.php b/app/Action/TaskAssignColorUser.php
index 00680186..d419ab4d 100644
--- a/app/Action/TaskAssignColorUser.php
+++ b/app/Action/TaskAssignColorUser.php
@@ -68,7 +68,7 @@ class TaskAssignColorUser extends Base
'color_id' => $this->getParam('color_id'),
);
- return $this->task->update($values, false);
+ return $this->taskModification->update($values, false);
}
/**
diff --git a/app/Action/TaskAssignCurrentUser.php b/app/Action/TaskAssignCurrentUser.php
index 7a9cf70b..9317bf83 100644
--- a/app/Action/TaskAssignCurrentUser.php
+++ b/app/Action/TaskAssignCurrentUser.php
@@ -67,7 +67,7 @@ class TaskAssignCurrentUser extends Base
'owner_id' => $this->acl->getUserId(),
);
- return $this->task->update($values, false);
+ return $this->taskModification->update($values, false);
}
/**
diff --git a/app/Action/TaskAssignSpecificUser.php b/app/Action/TaskAssignSpecificUser.php
index f70459be..c3b979c2 100644
--- a/app/Action/TaskAssignSpecificUser.php
+++ b/app/Action/TaskAssignSpecificUser.php
@@ -68,7 +68,7 @@ class TaskAssignSpecificUser extends Base
'owner_id' => $this->getParam('user_id'),
);
- return $this->task->update($values, false);
+ return $this->taskModification->update($values, false);
}
/**
diff --git a/app/Action/TaskAssignUser.php b/app/Action/TaskAssignUser.php
index 29ea91e6..d01c4073 100644
--- a/app/Action/TaskAssignUser.php
+++ b/app/Action/TaskAssignUser.php
@@ -64,7 +64,7 @@ class TaskAssignUser extends Base
'owner_id' => $data['owner_id'],
);
- return $this->task->update($values, false);
+ return $this->taskModification->update($values, false);
}
/**
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index e317a56b..8dd96c56 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -34,6 +34,7 @@ use Model\LastLogin;
* @property \Model\SubTask $subTask
* @property \Model\Task $task
* @property \Model\TaskCreation $taskCreation
+ * @property \Model\TaskModification $taskModification
* @property \Model\TaskHistory $taskHistory
* @property \Model\TaskExport $taskExport
* @property \Model\TaskFinder $taskFinder
diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index e14b94c7..bdc82136 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -62,7 +62,7 @@ class Board extends Base
list($valid,) = $this->taskValidator->validateAssigneeModification($values);
- if ($valid && $this->task->update($values)) {
+ if ($valid && $this->taskModification->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
@@ -101,7 +101,7 @@ class Board extends Base
list($valid,) = $this->taskValidator->validateCategoryModification($values);
- if ($valid && $this->task->update($values)) {
+ if ($valid && $this->taskModification->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index e75058d9..6c6eaf90 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -204,7 +204,7 @@ class Task extends Base
if ($valid) {
- if ($this->task->update($values)) {
+ if ($this->taskModification->update($values)) {
$this->session->flash(t('Task updated successfully.'));
if ($this->request->getIntegerParam('ajax')) {
@@ -245,7 +245,7 @@ class Task extends Base
list($valid, $errors) = $this->taskValidator->validateTimeModification($values);
- if ($valid && $this->task->update($values)) {
+ if ($valid && $this->taskModification->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
@@ -386,7 +386,7 @@ class Task extends Base
if ($valid) {
- if ($this->task->update($values)) {
+ if ($this->taskModification->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
diff --git a/app/Model/Task.php b/app/Model/Task.php
index 4fed25f6..f382b604 100644
--- a/app/Model/Task.php
+++ b/app/Model/Task.php
@@ -40,89 +40,6 @@ class Task extends Base
const EVENT_ASSIGNEE_CHANGE = 'task.assignee_change';
/**
- * Prepare data before task creation or modification
- *
- * @access public
- * @param array $values Form values
- */
- public function prepare(array &$values)
- {
- $this->dateParser->convert($values, array('date_due', 'date_started'));
- $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'));
- }
-
- /**
- * Prepare data before task modification
- *
- * @access public
- * @param array $values Form values
- */
- public function prepareModification(array &$values)
- {
- $this->prepare($values);
- $values['date_modification'] = time();
- }
-
- /**
- * Update a task
- *
- * @access public
- * @param array $values Form values
- * @param boolean $trigger_Events Trigger events
- * @return boolean
- */
- public function update(array $values, $trigger_events = true)
- {
- // Fetch original task
- $original_task = $this->taskFinder->getById($values['id']);
-
- if (! $original_task) {
- return false;
- }
-
- // Prepare data
- $updated_task = $values;
- $this->prepareModification($updated_task);
-
- $result = $this->db->table(self::TABLE)->eq('id', $values['id'])->update($updated_task);
-
- if ($result && $trigger_events) {
- $this->triggerUpdateEvents($original_task, $updated_task);
- }
-
- return true;
- }
-
- /**
- * Trigger events for task modification
- *
- * @access public
- * @param array $original_task Original task data
- * @param array $updated_task Updated task data
- */
- public function triggerUpdateEvents(array $original_task, array $updated_task)
- {
- $events = array();
-
- if (isset($updated_task['owner_id']) && $original_task['owner_id'] != $updated_task['owner_id']) {
- $events[] = self::EVENT_ASSIGNEE_CHANGE;
- }
- else {
- $events[] = self::EVENT_CREATE_UPDATE;
- $events[] = self::EVENT_UPDATE;
- }
-
- $event_data = array_merge($original_task, $updated_task);
- $event_data['task_id'] = $original_task['id'];
-
- foreach ($events as $event) {
- $this->event->trigger($event, $event_data);
- }
- }
-
- /**
* Remove a task
*
* @access public
diff --git a/app/Model/TaskModification.php b/app/Model/TaskModification.php
new file mode 100644
index 00000000..b165ea24
--- /dev/null
+++ b/app/Model/TaskModification.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Model;
+
+/**
+ * Task Modification
+ *
+ * @package model
+ * @author Frederic Guillot
+ */
+class TaskModification extends Base
+{
+ /**
+ * Update a task
+ *
+ * @access public
+ * @param array $values
+ * @param boolean $fire_events
+ * @return boolean
+ */
+ public function update(array $values, $fire_events = true)
+ {
+ $original_task = $this->taskFinder->getById($values['id']);
+
+ $this->prepare($values);
+ $result = $this->db->table(Task::TABLE)->eq('id', $original_task['id'])->update($values);
+
+ if ($result && $fire_events) {
+ $this->fireEvents($original_task, $values);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Fire events
+ *
+ * @access public
+ * @param array $task
+ * @param array $new_values
+ */
+ public function fireEvents(array $task, array $new_values)
+ {
+ $event_data = array_merge($task, $new_values, array('task_id' => $task['id']));
+
+ if (isset($new_values['owner_id']) && $task['owner_id'] != $new_values['owner_id']) {
+ $events = array(Task::EVENT_ASSIGNEE_CHANGE);
+ }
+ else {
+ $events = array(Task::EVENT_CREATE_UPDATE, Task::EVENT_UPDATE);
+ }
+
+ foreach ($events as $event) {
+ $this->event->trigger($event, $event_data);
+ }
+ }
+
+ /**
+ * Prepare data before task modification
+ *
+ * @access public
+ * @param array $values Form values
+ */
+ public function prepare(array &$values)
+ {
+ $this->dateParser->convert($values, array('date_due', 'date_started'));
+ $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'));
+
+ $values['date_modification'] = time();
+ }
+}
diff --git a/app/Model/TaskPosition.php b/app/Model/TaskPosition.php
index f8ac4fd9..c23bc3b5 100644
--- a/app/Model/TaskPosition.php
+++ b/app/Model/TaskPosition.php
@@ -109,6 +109,14 @@ class TaskPosition extends Base
});
}
+ /**
+ * Fire events
+ *
+ * @access public
+ * @param array $task
+ * @param integer $new_column_id
+ * @param integer $new_position
+ */
public function fireEvents(array $task, $new_column_id, $new_position)
{
$event_data = array(
generated by cgit v1.2.3 (git 2.46.0) at 2025-02-17 05:39:38 +0000