From aa67575ecbcb73ef295c4d25f3cf89592af8bb3a Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 14 Jun 2016 12:56:18 +0300 Subject: [PATCH] internal post dev --- application/Espo/Services/Stream.php | 2 +- client/res/templates/stream/notes/post.tpl | 6 ++++++ client/src/views/stream/notes/post.js | 3 +++ frontend/less/espo/custom.less | 8 ++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/application/Espo/Services/Stream.php b/application/Espo/Services/Stream.php index 177f0c9355..235dbbf83a 100644 --- a/application/Espo/Services/Stream.php +++ b/application/Espo/Services/Stream.php @@ -295,7 +295,7 @@ class Stream extends \Espo\Core\Services\Base $select = [ 'id', 'number', 'type', 'post', 'data', 'parentType', 'parentId', 'relatedType', 'relatedId', - 'targetType', 'createdAt', 'createdById', 'createdByName', 'isGlobal' + 'targetType', 'createdAt', 'createdById', 'createdByName', 'isGlobal', 'isInternal' ]; $selectParamsList = []; diff --git a/client/res/templates/stream/notes/post.tpl b/client/res/templates/stream/notes/post.tpl index 3dc043e1ce..0a70216a63 100644 --- a/client/res/templates/stream/notes/post.tpl +++ b/client/res/templates/stream/notes/post.tpl @@ -9,7 +9,13 @@
{{{avatar}}} + {{#if isInternal}} +
+ +
+ {{/if}}
+
{{{message}}}
diff --git a/client/src/views/stream/notes/post.js b/client/src/views/stream/notes/post.js index c8205f44b1..ad9539b07e 100644 --- a/client/src/views/stream/notes/post.js +++ b/client/src/views/stream/notes/post.js @@ -42,6 +42,7 @@ Espo.define('views/stream/notes/post', 'views/stream/note', function (Dep) { var data = Dep.prototype.data.call(this); data.showAttachments = !!(this.model.get('attachmentsIds') || []).length; data.showPost = !!this.model.get('post'); + data.isInternal = this.isInternal; return data; }, @@ -50,6 +51,8 @@ Espo.define('views/stream/notes/post', 'views/stream/note', function (Dep) { this.createField('post', null, null, 'views/stream/fields/post'); this.createField('attachments', 'attachmentMultiple', {}, 'views/stream/fields/attachment-multiple'); + this.isInternal = this.model.get('isInternal'); + if (!this.model.get('post') && this.model.get('parentId')) { this.messageName = 'attach'; if (this.isThis) { diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index c1a77f7e05..ff069db88b 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -840,6 +840,14 @@ body > footer > p a:visited { margin-bottom: -2px; } +.stream-head-container .internal-badge { + position: absolute; top: 34px; left: 19px; +} + +.stream-head-container .internal-badge > span { + color: @brand-danger; +} + img.avatar.avatar-link { display: inline-block; margin-top: -2px;