ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix proper activity object data (#1117)

Browse Source 
Fix proper activity object data
This commit is contained in:
Julius Härtl
2019-07-05 15:46:41 +02:00
committed by GitHub
parent 78233b2d62 f3b5fd4030
commit c5cfef3ddb
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/controller/ActivityController.js
View File

@@ -284,7 +284,7 @@ class ActivityController {
parseMessage(activity) { parseMessage(activity) {
let subject = activity.subject_rich[0]; let subject = activity.subject_rich[0];
let parameters = activity.subject_rich[1]; let parameters = activity.subject_rich[1];
if (parameters.after && parameters.after.id && parameters.after.id.startsWith('dt:')) { if (parameters.after && typeof parameters.after.id === 'string' && parameters.after.id.startsWith('dt:')) {
let dateTime = parameters.after.id.substr(3); let dateTime = parameters.after.id.substr(3);
parameters.after.name = moment(dateTime).format('L LTS'); parameters.after.name = moment(dateTime).format('L LTS');
} }

2
lib/Activity/ActivityManager.php
View File

@@ -358,14 +358,12 @@ class ActivityManager {
case self::SUBJECT_CARD_USER_ASSIGN: case self::SUBJECT_CARD_USER_ASSIGN:
case self::SUBJECT_CARD_USER_UNASSIGN: case self::SUBJECT_CARD_USER_UNASSIGN:
$subjectParams = $this->findDetailsForCard($entity->getId(), $subject); $subjectParams = $this->findDetailsForCard($entity->getId(), $subject);
$object = $entity;
break; break;
case self::SUBJECT_ATTACHMENT_CREATE: case self::SUBJECT_ATTACHMENT_CREATE:
case self::SUBJECT_ATTACHMENT_UPDATE: case self::SUBJECT_ATTACHMENT_UPDATE:
case self::SUBJECT_ATTACHMENT_DELETE: case self::SUBJECT_ATTACHMENT_DELETE:
case self::SUBJECT_ATTACHMENT_RESTORE: case self::SUBJECT_ATTACHMENT_RESTORE:
$subjectParams = $this->findDetailsForAttachment($entity->getId()); $subjectParams = $this->findDetailsForAttachment($entity->getId());
$object = $subjectParams['card'];
break; break;
case self::SUBJECT_BOARD_SHARE: case self::SUBJECT_BOARD_SHARE:
case self::SUBJECT_BOARD_UNSHARE: case self::SUBJECT_BOARD_UNSHARE: