AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1245 - Subtask - Added option to events to avoid recursive calls

Browse Source
This commit is contained in:
Max Kamashev
2015-09-24 12:06:02 +03:00
parent aeb79f7de5
commit 5b2e49d294
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Model/Subtask.php
View File

@@ -234,15 +234,16 @@ class Subtask extends Base
* *
* @access public * @access public
* @param array $values Form values * @param array $values Form values
* @param array $options Additional options. If passed [quietly => true] - will not be called an event
* @return bool * @return bool
*/ */
public function update(array $values) public function update(array $values, array $options = null)
{ {
$this->prepare($values); $this->prepare($values);
$subtask = $this->getById($values['id']); $subtask = $this->getById($values['id']);
$result = $this->db->table(self::TABLE)->eq('id', $values['id'])->save($values); $result = $this->db->table(self::TABLE)->eq('id', $values['id'])->save($values);
if ($result) { if ($result && isset($options['quietly']) && $options['quietly']) {
$event = $subtask; $event = $subtask;
$event['changes'] = array_diff_assoc($values, $subtask); $event['changes'] = array_diff_assoc($values, $subtask);
$this->container['dispatcher']->dispatch(self::EVENT_UPDATE, new SubtaskEvent($event)); $this->container['dispatcher']->dispatch(self::EVENT_UPDATE, new SubtaskEvent($event));

2
app/Model/SubtaskTimeTracking.php
View File

@@ -345,7 +345,7 @@ class SubtaskTimeTracking extends Base
'id' => $subtask['id'], 'id' => $subtask['id'],
'time_spent' => $subtask['time_spent'] + $time_spent, 'time_spent' => $subtask['time_spent'] + $time_spent,
'task_id' => $subtask['task_id'], 'task_id' => $subtask['task_id'],
)); ), array('quietly' => true));
} }
/** /**