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

fix stream note

Browse Source
This commit is contained in:
yuri
2018-03-06 11:25:39 +02:00
parent 56a06a5581
commit 75da037656
6 changed files with 100 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Acl/Note.php
+45
View File
@@ -0,0 +1,45 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
* Website: http://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Acl;
use \Espo\Entities\User as EntityUser;
use \Espo\ORM\Entity;
class Note extends \Espo\Core\Acl\Base
{
public function checkIsOwner(EntityUser $user, Entity $entity)
{
if ($entity->get('type') === 'Post' && $user->id === $entity->get('createdById')) {
return true;
}
return false;
}
}
application/Espo/AclPortal/Note.php
+45
View File
@@ -0,0 +1,45 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
* Website: http://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\AclPortal;
use \Espo\Entities\User as EntityUser;
use \Espo\ORM\Entity;
class Note extends \Espo\Core\AclPortal\Base
{
public function checkIsOwner(EntityUser $user, Entity $entity)
{
if ($entity->get('type') === 'Post' && $user->id === $entity->get('createdById')) {
return true;
}
return false;
}
}
client/src/views/stream/note.js
+3
View File
@@ -70,6 +70,9 @@ Espo.define('views/stream/note', 'view', function (Dep) {
}
}
if (this.getUser().isAdmin()) {
this.isRemovable = true;
}
if (this.messageName && this.isThis) {
this.messageName += 'This';
client/src/views/stream/notes/create.js
+1 -1
View File
@@ -36,7 +36,7 @@ Espo.define('views/stream/notes/create', 'views/stream/note', function (Dep) {
messageName: 'create',
isRemovable: true,
isRemovable: false,
data: function () {
return _.extend({
client/src/views/stream/notes/email-received.js
+3 -3
View File
@@ -26,13 +26,13 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('Views.Stream.Notes.EmailReceived', 'Views.Stream.Note', function (Dep) {
Espo.define('views/stream/notes/email-received', 'views/stream/note', function (Dep) {
return Dep.extend({
template: 'stream.notes.email-received',
template: 'stream/notes/email-received',
isRemovable: true,
isRemovable: false,
isSystemAvatar: true,
client/src/views/stream/notes/email-sent.js
+3 -4
View File
@@ -26,13 +26,13 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('Views.Stream.Notes.EmailSent', 'Views.Stream.Note', function (Dep) {
Espo.define('views/stream/notes/email-sent', 'views/stream/note', function (Dep) {
return Dep.extend({
template: 'stream.notes.email-sent',
template: 'stream/notes/email-sent',
isRemovable: true,
isRemovable: false,
data: function () {
return _.extend({
@@ -80,4 +80,3 @@ Espo.define('Views.Stream.Notes.EmailSent', 'Views.Stream.Note', function (Dep)
});
});