From 26cfe12c866a8757b0bfbb2ff64cb23d6f785039 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 24 Apr 2014 14:20:06 +0300 Subject: [PATCH] move stream related metadata --- application/Espo/Hooks/Common/Stream.php | 2 +- .../metadata/app/streamCreateRelated.json | 28 ----------------- .../Resources/metadata/entityDefs/Note.json | 30 ++++++++++++++++++- 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 application/Espo/Resources/metadata/app/streamCreateRelated.json diff --git a/application/Espo/Hooks/Common/Stream.php b/application/Espo/Hooks/Common/Stream.php index a5e8cd2519..7757ec8082 100644 --- a/application/Espo/Hooks/Common/Stream.php +++ b/application/Espo/Hooks/Common/Stream.php @@ -62,7 +62,7 @@ class Stream extends \Espo\Core\Hooks\Base protected function isLinkObservableInStream($scope, $link) { return $this->getMetadata()->get("scopes.{$scope}.stream") && - in_array($link, $this->getMetadata()->get("app.streamCreateRelated.{$scope}", array())); + in_array($link, $this->getMetadata()->get("entityDefs.Note.streamRelated.{$scope}", array())); } protected function handleCreateRelated(Entity $entity) diff --git a/application/Espo/Resources/metadata/app/streamCreateRelated.json b/application/Espo/Resources/metadata/app/streamCreateRelated.json deleted file mode 100644 index f3bcbd6c70..0000000000 --- a/application/Espo/Resources/metadata/app/streamCreateRelated.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "Account": [ - "meetings", - "calls", - "tasks", - "opportunities" - ], - "Contact": [ - "meetings", - "calls", - "tasks" - ], - "Lead": [ - "meetings", - "calls", - "tasks" - ], - "Opportunity": [ - "meetings", - "calls", - "tasks" - ], - "Case": [ - "meetings", - "calls", - "tasks" - ] -} diff --git a/application/Espo/Resources/metadata/entityDefs/Note.json b/application/Espo/Resources/metadata/entityDefs/Note.json index cc30bbc8bf..ace9a65448 100644 --- a/application/Espo/Resources/metadata/entityDefs/Note.json +++ b/application/Espo/Resources/metadata/entityDefs/Note.json @@ -54,5 +54,33 @@ "collection": { "sortBy": "createdAt", "asc": false - } + }, + "streamRelated": { + "Account": [ + "meetings", + "calls", + "tasks", + "opportunities" + ], + "Contact": [ + "meetings", + "calls", + "tasks" + ], + "Lead": [ + "meetings", + "calls", + "tasks" + ], + "Opportunity": [ + "meetings", + "calls", + "tasks" + ], + "Case": [ + "meetings", + "calls", + "tasks" + ] + } }