Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Comments] Filter comments by group

Browse source
This commit is contained in:
Julia Radzhabova 2021-11-25 01:39:43 +03:00
parent 5995a0045a
commit 83b2ef677b
4 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/common/main/lib/controller/Comments.js
View file

@ -698,7 +698,7 @@ define([
var end = true; var end = true;
for (var i = this.collection.length - 1; i >= 0; --i) { for (var i = this.collection.length - 1; i >= 0; --i) {
var item = this.collection.at(i); var item = this.collection.at(i);
if (end && !item.get('hide')) { if (end && !item.get('hide') && !item.get('filtered')) {
item.set('last', true, {silent: true}); item.set('last', true, {silent: true});
end = false; end = false;
} else { } else {
@ -834,7 +834,13 @@ define([
comment.set('removable', (t.mode.canDeleteComments || (data.asc_getUserId() == t.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName())); comment.set('removable', (t.mode.canDeleteComments || (data.asc_getUserId() == t.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName()));
comment.set('hide', !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName())); comment.set('hide', !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName()));
!comment.get('hide') && t.fillUserGroups(comment.get('parsedGroups')); if (!comment.get('hide')) {
var usergroups = comment.get('parsedGroups');
t.fillUserGroups(usergroups);
var group = Common.Utils.InternalSettings.get(t.appPrefix + "comments-filtergroups");
var filter = !!group && (group!==-1) && (!usergroups || usergroups.length<1 || usergroups.indexOf(group)<0);
comment.set('filtered', filter);
}
replies = _.clone(comment.get('replys')); replies = _.clone(comment.get('replys'));
@ -1155,7 +1161,7 @@ define([
for (i = this.collection.length - 1; i >= 0; --i) { for (i = this.collection.length - 1; i >= 0; --i) {
var item = this.collection.at(i); var item = this.collection.at(i);
if (end && !item.get('hide')) { if (end && !item.get('hide') && !item.get('filtered')) {
item.set('last', true, {silent: true}); item.set('last', true, {silent: true});
end = false; end = false;
} else { } else {
@ -1337,7 +1343,13 @@ define([
groupName : (groupname && groupname.length>1) ? groupname[1] : null groupName : (groupname && groupname.length>1) ? groupname[1] : null
}); });
if (comment) { if (comment) {
!comment.get('hide') && this.fillUserGroups(comment.get('parsedGroups')); if (!comment.get('hide')) {
var usergroups = comment.get('parsedGroups');
this.fillUserGroups(usergroups);
var group = Common.Utils.InternalSettings.get(this.appPrefix + "comments-filtergroups");
var filter = !!group && (group!==-1) && (!usergroups || usergroups.length<1 || usergroups.indexOf(group)<0);
comment.set('filtered', filter);
}
var replies = this.readSDKReplies(data); var replies = this.readSDKReplies(data);
if (replies.length) { if (replies.length) {
comment.set('replys', replies); comment.set('replys', replies);
@ -1688,8 +1700,24 @@ define([
}, },
setFilterGroups: function (group) { setFilterGroups: function (group) {
Common.Utils.InternalSettings.set(this.appPrefix + "comments-filtergroups", group) Common.Utils.InternalSettings.set(this.appPrefix + "comments-filtergroups", group);
var i, end = true;
for (i = this.collection.length - 1; i >= 0; --i) {
var item = this.collection.at(i);
if (!item.get('hide')) {
var usergroups = item.get('parsedGroups');
item.set('filtered', !!group && (group!==-1) && (!usergroups || usergroups.length<1 || usergroups.indexOf(group)<0), {silent: true});
}
if (end && !item.get('hide') && !item.get('filtered')) {
item.set('last', true, {silent: true});
end = false;
} else {
if (item.get('last')) {
item.set('last', false, {silent: true});
}
}
}
this.updateComments(true);
} }
}, Common.Controllers.Comments || {})); }, Common.Controllers.Comments || {}));

1
apps/common/main/lib/model/Comment.js
View file

@ -80,6 +80,7 @@ define([
hideAddReply : false, hideAddReply : false,
scope : null, scope : null,
hide : false, hide : false,
filtered : false,
hint : false, hint : false,
dummy : undefined, dummy : undefined,
editable : true, editable : true,

2
apps/common/main/lib/template/Comments.template
View file

@ -1,4 +1,4 @@
<% if (!hide) { %> <% if (!hide && !filtered) { %>
<div id="<%= id %>" class="user-comment-item"> <div id="<%= id %>" class="user-comment-item">
<!-- comment block --> <!-- comment block -->

2
apps/common/main/lib/view/Comments.js
View file

@ -408,7 +408,7 @@ define([
this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this)); this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this));
this.buttonClose.on('click', _.bind(this.onClickClosePanel, this)); this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
this.buttonSort.menu.on('item:toggle', _.bind(this.onSortClick, this)); this.buttonSort.menu.on('item:toggle', _.bind(this.onSortClick, this));
this.menuFilterGroups.on('item:toggle', _.bind(this.onFilterGroupsClick, this)); this.menuFilterGroups.menu.on('item:toggle', _.bind(this.onFilterGroupsClick, this));
this.txtComment = $('#comment-msg-new', this.el); this.txtComment = $('#comment-msg-new', this.el);
this.txtComment.keydown(function (event) { this.txtComment.keydown(function (event) {