diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | app/Model/TaskFilter.php | 3 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.lock | 12 | ||||
| -rw-r--r-- | tests/units/TaskFilterTest.php | 2 |
5 files changed, 11 insertions, 9 deletions
@@ -12,6 +12,7 @@ New features: Improvements: * Enable support for Github Enterprise when using Github Authentication +* Update iCalendar library to display organizer name Bug fixes: diff --git a/app/Model/TaskFilter.php b/app/Model/TaskFilter.php index 77ab1f3c..956ffbe8 100644 --- a/app/Model/TaskFilter.php +++ b/app/Model/TaskFilter.php @@ -101,6 +101,7 @@ class TaskFilter extends Base $this->query->columns( Task::TABLE.'.*', 'ua.email AS assignee_email', + 'ua.name AS assignee_name', 'ua.username AS assignee_username', 'uc.email AS creator_email', 'uc.username AS creator_username' @@ -833,7 +834,7 @@ class TaskFilter extends Base $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); if (! empty($task['owner_id'])) { - $vEvent->setOrganizer('MAILTO:'.($task['assignee_email'] ?: $task['assignee_username'].'@kanboard.local')); + $vEvent->setOrganizer($task['assignee_name'] ?: $task['assignee_username'], $task['assignee_email']); } if (! empty($task['creator_id'])) { diff --git a/composer.json b/composer.json index 375d2ee8..c1f12c6f 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "ext-mbstring" : "*", "ext-gd" : "*", "christian-riesen/otp" : "1.4", - "eluceo/ical": "0.7.0", + "eluceo/ical": "0.8.0", "erusev/parsedown" : "1.5.3", "fabiang/xmpp" : "0.6.1", "fguillot/json-rpc" : "dev-master", diff --git a/composer.lock b/composer.lock index 9009a97d..6ec8ac46 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d88040d41c5a7cfee8e6fcd9dbc4a591", + "hash": "aa2376c6b4ac36457adf8cf46f584fd9", "packages": [ { "name": "christian-riesen/base32", @@ -110,16 +110,16 @@ }, { "name": "eluceo/ical", - "version": "0.7.0", + "version": "0.8.0", "source": { "type": "git", "url": "https://github.com/markuspoerschke/iCal.git", - "reference": "0d79c35b9e5f7f1dcfb5315cc1e8507f74093083" + "reference": "a291711851d1538e2726ffe95862aa5e340ddb9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/markuspoerschke/iCal/zipball/0d79c35b9e5f7f1dcfb5315cc1e8507f74093083", - "reference": "0d79c35b9e5f7f1dcfb5315cc1e8507f74093083", + "url": "https://api.github.com/repos/markuspoerschke/iCal/zipball/a291711851d1538e2726ffe95862aa5e340ddb9a", + "reference": "a291711851d1538e2726ffe95862aa5e340ddb9a", "shasum": "" }, "require": { @@ -159,7 +159,7 @@ "ics", "php calendar" ], - "time": "2015-02-21 23:14:47" + "time": "2015-07-12 18:19:30" }, { "name": "erusev/parsedown", diff --git a/tests/units/TaskFilterTest.php b/tests/units/TaskFilterTest.php index 47fe4e35..5f606d7a 100644 --- a/tests/units/TaskFilterTest.php +++ b/tests/units/TaskFilterTest.php @@ -60,7 +60,7 @@ class TaskFilterTest extends Base $this->assertContains('DTEND;TZID=UTC;VALUE=DATE:'.date('Ymd', strtotime('+5 days')), $ics); $this->assertContains('URL:http://kb/?controller=task&action=show&task_id=1&project_id=1', $ics); $this->assertContains('SUMMARY:#1 task1', $ics); - $this->assertContains('ORGANIZER:MAILTO:bob@localhost', $ics); + $this->assertContains('ORGANIZER;CN=admin:MAILTO:bob@localhost', $ics); $this->assertContains('X-MICROSOFT-CDO-ALLDAYEVENT:TRUE', $ics); } |