From 42a76bced9a82335a7e10a06ff4787b6f248cabc Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 11 Oct 2017 19:51:18 +0000 Subject: [PATCH 1/2] export event data for display purposes --- include/conversation.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 8d3ee98a26..184d8b9112 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -463,7 +463,14 @@ These Fields are not added below (yet). They are here to for bug search. `author`.`thumb` AS `author-thumb`, `owner`.`thumb` AS `owner-thumb`, `contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`, - `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`"; + `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`, + + `event`.`created` AS `event-created`, `event`.`edited` AS `event-edited`, + `event`.`start` AS `event-start`,`event`.`finish` AS `event-finish`, + `event`.`summary` AS `event-summary`,`event`.`desc` AS `event-desc`, + `event`.`location` AS `event-location`, `event`.`type` AS `event-type`, + `event`.`nofinish` AS `event-nofinish`,`event`.`adjust` AS `event-adjust`, + `event`.`ignore` AS `event-ignore`"; } /** @@ -473,7 +480,8 @@ function item_joins() { return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` - LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`"; + LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` + LEFT JOIN `event` ON `event-id` = `event`.`id`"; } /** From eeec1ea1635a54b8149a029d0b9e8f97269af087 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 11 Oct 2017 20:45:03 +0000 Subject: [PATCH 2/2] We should take the event-id as well --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 184d8b9112..05c41e6d27 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -470,7 +470,7 @@ These Fields are not added below (yet). They are here to for bug search. `event`.`summary` AS `event-summary`,`event`.`desc` AS `event-desc`, `event`.`location` AS `event-location`, `event`.`type` AS `event-type`, `event`.`nofinish` AS `event-nofinish`,`event`.`adjust` AS `event-adjust`, - `event`.`ignore` AS `event-ignore`"; + `event`.`ignore` AS `event-ignore`, `event`.`id` AS `event-id`"; } /**