espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix naming

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-01-21 11:47:14 +02:00
parent db334baa2e
commit 8fa65bc965
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Services/Stream.php
+7 -7
View File
@@ -186,7 +186,7 @@ class Stream extends \Espo\Core\Services\Base
$sql = "
SELECT id FROM subscription
WHERE
entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityName()) . " AND
entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityType()) . " AND
user_id = " . $pdo->quote($userId) . "
";
@@ -272,7 +272,7 @@ class Stream extends \Espo\Core\Services\Base
if ($userId == 'system') {
return;
}
if (!$this->getMetadata()->get('scopes.' . $entity->getEntityName() . '.stream')) {
if (!$this->getMetadata()->get('scopes.' . $entity->getEntityType() . '.stream')) {
return false;
}
@@ -295,7 +295,7 @@ class Stream extends \Espo\Core\Services\Base
INSERT INTO subscription
(entity_id, entity_type, user_id)
VALUES
(".$pdo->quote($entity->id) . ", " . $pdo->quote($entity->getEntityName()) . ", " . $pdo->quote($userId).")
(".$pdo->quote($entity->id) . ", " . $pdo->quote($entity->getEntityType()) . ", " . $pdo->quote($userId).")
";
$sth = $pdo->prepare($sql)->execute();
}
@@ -304,7 +304,7 @@ class Stream extends \Espo\Core\Services\Base
public function unfollowEntity(Entity $entity, $userId)
{
if (!$this->getMetadata()->get('scopes.' . $entity->getEntityName() . '.stream')) {
if (!$this->getMetadata()->get('scopes.' . $entity->getEntityType() . '.stream')) {
return false;
}
@@ -313,7 +313,7 @@ class Stream extends \Espo\Core\Services\Base
$sql = "
DELETE FROM subscription
WHERE
entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityName()) . " AND
entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityType()) . " AND
user_id = " . $pdo->quote($userId) . "
";
$sth = $pdo->prepare($sql)->execute();
@@ -1157,7 +1157,7 @@ class Stream extends \Espo\Core\Services\Base
if ($from) {
$person = $this->getEntityManager()->getRepository('EmailAddress')->getEntityByAddress($from);
if ($person) {
$data['personEntityType'] = $person->getEntityName();
$data['personEntityType'] = $person->getEntityType();
$data['personEntityName'] = $person->get('name');
$data['personEntityId'] = $person->id;
}
@@ -1214,7 +1214,7 @@ class Stream extends \Espo\Core\Services\Base
}
if ($person) {
$data['personEntityType'] = $person->getEntityName();
$data['personEntityType'] = $person->getEntityType();
$data['personEntityName'] = $person->get('name');
$data['personEntityId'] = $person->id;
}