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

[Comments] Fill user groups

Browse source
This commit is contained in:
Julia Radzhabova 2021-11-24 21:21:24 +03:00
parent 07af4cd5fd
commit d0f3011e6c
2 changed files with 72 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,8 @@ define([
// work handlers
'comment:closeEditing': _.bind(this.closeEditing, this),
'comment:sort': _.bind(this.setComparator, this)
'comment:sort': _.bind(this.setComparator, this),
'comment:filtergroups': _.bind(this.setFilterGroups, this)
},
'Common.Views.ReviewPopover': {
@ -157,6 +158,7 @@ define([
}
this.groupCollection = [];
this.userGroups = []; // for filtering comments
this.view = this.createView('Common.Views.Comments', { store: this.collection });
this.view.render();
@ -830,6 +832,8 @@ define([
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.get('hide') && t.fillUserGroups(data.asc_getUserName());
replies = _.clone(comment.get('replys'));
replies.length = 0;
@ -1329,6 +1333,7 @@ define([
groupName : (groupname && groupname.length>1) ? groupname[1] : null
});
if (comment) {
!comment.get('hide') && this.fillUserGroups(data.asc_getUserName());
var replies = this.readSDKReplies(data);
if (replies.length) {
comment.set('replys', replies);
@ -1639,6 +1644,49 @@ define([
clearCollections: function() {
this.collection.reset();
this.groupCollection = [];
},
fillUserGroups: function(username) {
if (!this.mode.canUseCommentPermissions) return;
var usergroups = AscCommon.UserInfoParser.getParsedGroups(username),
viewgroups = AscCommon.UserInfoParser.getCommentPermissions('view');
if (usergroups && usergroups.length>0) {
if (viewgroups) {
usergroups = _.intersection(usergroups, viewgroups);
usergroups = _.uniq(this.userGroups.concat(usergroups));
}
}
if (this.view && this.view.buttonSort && _.difference(usergroups, this.userGroups).length>0) {
this.userGroups = usergroups;
var menu = this.view.buttonSort.menu;
menu.items[menu.items.length-1].setVisible(this.userGroups.length>0);
menu.items[menu.items.length-2].setVisible(this.userGroups.length>0);
menu = menu.items[menu.items.length-1].menu;
menu.removeAll();
var last = Common.Utils.InternalSettings.get(this.appPrefix + "comments-filtergroups");
menu.addItem(new Common.UI.MenuItem({
checkable: true,
checked: last===-1 || last===undefined,
toggleGroup: 'filtercomments',
caption: this.view.textAll,
value: -1
}));
this.userGroups.forEach(function(item){
menu.addItem(new Common.UI.MenuItem({
checkable: true,
checked: last === item,
toggleGroup: 'filtercomments',
caption: Common.Utils.String.htmlEncode(item),
value: item
}));
});
}
},
setFilterGroups: function (group) {
Common.Utils.InternalSettings.set(this.appPrefix + "comments-filtergroups", group)
}
}, Common.Controllers.Comments || {}));

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

@ -377,7 +377,21 @@ define([
visible: this.appPrefix==='de-',
checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-desc',
toggleGroup: 'sortcomments'
}
},
{
caption: '--',
visible: false
},
this.menuFilterGroups = new Common.UI.MenuItem({
caption: this.mniFilterGroups,
checkable: false,
visible: false,
menu: new Common.UI.Menu({
menuAlign: 'tl-tr',
style: 'min-width: auto;',
items: []
})
})
]
})
});
@ -394,6 +408,7 @@ define([
this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this));
this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
this.buttonSort.menu.on('item:toggle', _.bind(this.onSortClick, this));
this.menuFilterGroups.on('item:toggle', _.bind(this.onFilterGroupsClick, this));
this.txtComment = $('#comment-msg-new', this.el);
this.txtComment.keydown(function (event) {
@ -812,6 +827,10 @@ define([
state && this.fireEvent('comment:sort', [item.value]);
},
onFilterGroupsClick: function(menu, item, state) {
state && this.fireEvent('comment:filtergroups', [item.value]);
},
onClickClosePanel: function() {
Common.NotificationCenter.trigger('leftmenu:change', 'hide');
},
@ -839,6 +858,8 @@ define([
mniDateDesc: 'Newest',
mniDateAsc: 'Oldest',
textClosePanel: 'Close comments',
textViewResolved: 'You have not permission for reopen comment'
textViewResolved: 'You have not permission for reopen comment',
mniFilterGroups: 'Filter by Group',
textAll: 'All'
}, Common.Views.Comments || {}))
});