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

Fixed empty title for web notification with only one overdue task

Browse Source
This commit is contained in:
Frederic Guillot
2016-07-01 12:33:18 -04:00
parent 662506941f
commit abdfa46cfc
7 changed files with 152 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -23,6 +23,7 @@ Bug fixes:
* Fixed identical background color for LetterAvatar on 32bits platforms (Hash greater than PHP_MAX_INT) * Fixed identical background color for LetterAvatar on 32bits platforms (Hash greater than PHP_MAX_INT)
* Fixed lexer issue with non word characters * Fixed lexer issue with non word characters
* Flush memory cache in worker to get latest config values * Flush memory cache in worker to get latest config values
* Fixed empty title for web notification with only one overdue task
Version 1.0.30 Version 1.0.30
-------------- --------------

2
app/Console/TaskOverdueNotificationCommand.php
View File

@@ -149,7 +149,7 @@ class TaskOverdueNotificationCommand extends BaseCommand
$this->userNotificationModel->sendUserNotification( $this->userNotificationModel->sendUserNotification(
$user, $user,
TaskModel::EVENT_OVERDUE, TaskModel::EVENT_OVERDUE,
array('tasks' => $user_tasks, 'project_name' => implode(", ", $project_names)) array('tasks' => $user_tasks, 'project_name' => implode(', ', $project_names))
); );
} }
} }

4
app/Controller/WebNotificationController.php
View File

@@ -54,14 +54,14 @@ class WebNotificationController extends BaseController
$this->response->redirect($this->helper->url->to( $this->response->redirect($this->helper->url->to(
'TaskViewController', 'TaskViewController',
'show', 'show',
array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id']), array('task_id' => $this->notificationModel->getTaskIdFromEvent($notification['event_name'], $notification['event_data'])),
'comment-'.$notification['event_data']['comment']['id'] 'comment-'.$notification['event_data']['comment']['id']
)); ));
} else { } else {
$this->response->redirect($this->helper->url->to( $this->response->redirect($this->helper->url->to(
'TaskViewController', 'TaskViewController',
'show', 'show',
array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id']) array('task_id' => $this->notificationModel->getTaskIdFromEvent($notification['event_name'], $notification['event_data']))
)); ));
} }
} }

37
app/Model/NotificationModel.php
View File

@@ -133,4 +133,41 @@ class NotificationModel extends Base
return e('Notification'); return e('Notification');
} }
} }
/**
* Get task id from event
*
* @access public
* @param string $event_name
* @param array $event_data
* @return integer
*/
public function getTaskIdFromEvent($event_name, array $event_data)
{
switch ($event_name) {
case TaskFileModel::EVENT_CREATE:
return $event_data['file']['task_id'];
case CommentModel::EVENT_CREATE:
case CommentModel::EVENT_UPDATE:
return $event_data['comment']['task_id'];
case SubtaskModel::EVENT_CREATE:
case SubtaskModel::EVENT_UPDATE:
return $event_data['subtask']['task_id'];
case TaskModel::EVENT_CREATE:
case TaskModel::EVENT_UPDATE:
case TaskModel::EVENT_CLOSE:
case TaskModel::EVENT_OPEN:
case TaskModel::EVENT_MOVE_COLUMN:
case TaskModel::EVENT_MOVE_POSITION:
case TaskModel::EVENT_MOVE_SWIMLANE:
case TaskModel::EVENT_ASSIGNEE_CHANGE:
case CommentModel::EVENT_USER_MENTION:
case TaskModel::EVENT_USER_MENTION:
return $event_data['task']['id'];
case TaskModel::EVENT_OVERDUE:
return $event_data['tasks'][0]['id'];
default:
return 0;
}
}
} }

6
app/Template/dashboard/notifications.php
View File

@@ -36,10 +36,8 @@
<i class="fa fa-file-o fa-fw"></i> <i class="fa fa-file-o fa-fw"></i>
<?php endif ?> <?php endif ?>
<?php if ($this->text->contains($notification['event_name'], 'task.overdue')): ?> <?php if ($this->text->contains($notification['event_name'], 'task.overdue') && count($notification['event_data']['tasks']) > 1): ?>
<?php if (count($notification['event_data']['tasks']) > 1): ?> <?= $notification['title'] ?>
<?= $notification['title'] ?>
<?php endif ?>
<?php else: ?> <?php else: ?>
<?= $this->url->link($notification['title'], 'WebNotificationController', 'redirect', array('notification_id' => $notification['id'], 'user_id' => $user['id'])) ?> <?= $this->url->link($notification['title'], 'WebNotificationController', 'redirect', array('notification_id' => $notification['id'], 'user_id' => $user['id'])) ?>
<?php endif ?> <?php endif ?>

109
tests/units/Model/NotificationModelTest.php Normal file
View File

@@ -0,0 +1,109 @@
<?php
require_once __DIR__.'/../Base.php';
use Kanboard\Model\TaskFinderModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\SubtaskModel;
use Kanboard\Model\CommentModel;
use Kanboard\Model\TaskFileModel;
use Kanboard\Model\TaskModel;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\NotificationModel;
use Kanboard\Subscriber\NotificationSubscriber;
class NotificationModelTest extends Base
{
public function testGetTitle()
{
$notificationModel = new NotificationModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskFinderModel = new TaskFinderModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$commentModel = new CommentModel($this->container);
$taskFileModel = new TaskFileModel($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('title' => 'test', 'task_id' => 1)));
$this->assertEquals(1, $commentModel->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
$this->assertEquals(1, $taskFileModel->create(1, 'test', 'blah', 123));
$task = $taskFinderModel->getDetails(1);
$subtask = $subtaskModel->getById(1, true);
$comment = $commentModel->getById(1);
$file = $commentModel->getById(1);
$this->assertNotEmpty($task);
$this->assertNotEmpty($subtask);
$this->assertNotEmpty($comment);
$this->assertNotEmpty($file);
foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
$title = $notificationModel->getTitleWithoutAuthor($event_name, array(
'task' => $task,
'comment' => $comment,
'subtask' => $subtask,
'file' => $file,
'changes' => array()
));
$this->assertNotEmpty($title);
$title = $notificationModel->getTitleWithAuthor('foobar', $event_name, array(
'task' => $task,
'comment' => $comment,
'subtask' => $subtask,
'file' => $file,
'changes' => array()
));
$this->assertNotEmpty($title);
}
$this->assertNotEmpty($notificationModel->getTitleWithoutAuthor(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
$this->assertNotEmpty($notificationModel->getTitleWithoutAuthor('unkown', array()));
}
public function testGetTaskIdFromEvent()
{
$notificationModel = new NotificationModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskFinderModel = new TaskFinderModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$commentModel = new CommentModel($this->container);
$taskFileModel = new TaskFileModel($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('title' => 'test', 'task_id' => 1)));
$this->assertEquals(1, $commentModel->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
$this->assertEquals(1, $taskFileModel->create(1, 'test', 'blah', 123));
$task = $taskFinderModel->getDetails(1);
$subtask = $subtaskModel->getById(1, true);
$comment = $commentModel->getById(1);
$file = $commentModel->getById(1);
$this->assertNotEmpty($task);
$this->assertNotEmpty($subtask);
$this->assertNotEmpty($comment);
$this->assertNotEmpty($file);
foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
$task_id = $notificationModel->getTaskIdFromEvent($event_name, array(
'task' => $task,
'comment' => $comment,
'subtask' => $subtask,
'file' => $file,
'changes' => array()
));
$this->assertEquals($task_id, $task['id']);
}
$this->assertEquals(1, $notificationModel->getTaskIdFromEvent(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
}
}

68
tests/units/Model/NotificationTest.php
View File

@@ -1,68 +0,0 @@
<?php
require_once __DIR__.'/../Base.php';
use Kanboard\Model\TaskFinderModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\SubtaskModel;
use Kanboard\Model\CommentModel;
use Kanboard\Model\TaskFileModel;
use Kanboard\Model\TaskModel;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\NotificationModel;
use Kanboard\Subscriber\NotificationSubscriber;
class NotificationTest extends Base
{
public function testGetTitle()
{
$wn = new NotificationModel($this->container);
$p = new ProjectModel($this->container);
$tf = new TaskFinderModel($this->container);
$tc = new TaskCreationModel($this->container);
$s = new SubtaskModel($this->container);
$c = new CommentModel($this->container);
$f = new TaskFileModel($this->container);
$this->assertEquals(1, $p->create(array('name' => 'test')));
$this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
$this->assertEquals(1, $s->create(array('title' => 'test', 'task_id' => 1)));
$this->assertEquals(1, $c->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
$this->assertEquals(1, $f->create(1, 'test', 'blah', 123));
$task = $tf->getDetails(1);
$subtask = $s->getById(1, true);
$comment = $c->getById(1);
$file = $c->getById(1);
$this->assertNotEmpty($task);
$this->assertNotEmpty($subtask);
$this->assertNotEmpty($comment);
$this->assertNotEmpty($file);
foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
$title = $wn->getTitleWithoutAuthor($event_name, array(
'task' => $task,
'comment' => $comment,
'subtask' => $subtask,
'file' => $file,
'changes' => array()
));
$this->assertNotEmpty($title);
$title = $wn->getTitleWithAuthor('foobar', $event_name, array(
'task' => $task,
'comment' => $comment,
'subtask' => $subtask,
'file' => $file,
'changes' => array()
));
$this->assertNotEmpty($title);
}
$this->assertNotEmpty($wn->getTitleWithoutAuthor(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
$this->assertNotEmpty($wn->getTitleWithoutAuthor('unkown', array()));
}
}