This repository has been archived by the owner on Feb 20, 2024. It is now read-only.
Release v2.7.0
Feature/moderate requests (#165) * Added menu entry for admin users to get to moderator page. * Added moderator xhtml pages and flag in UserBean to identify moderator; CommentBean needs still to be updated to show moderator in display * Database - table "comment - added column moderated of type boolean; this requires a regeneration of the affected POJOs using JOOQ; * UserBean - added checks if user has Moderator Role; UserBean - added variable to hold if user is on moderator details page (looks like the easiest way to keep this here, still ugly); navbar.xhtml - bugfix, did not point to moderator sub section; comment.xhtml - this is included in all details pages to render comments, now includes the prefix "Moderated by:" if the flag is set in the table comment on column moderated to true; jooq/tables - regenerated using JOOQ generate * rebased onto master detail.xhtml - removed unused reference to ModeratorQueriesDetailBean: DbUtil.java - set Moderated Flag on Comments when loaded from database; DBUtil.java - set moderated flag when a new comment is created, this should only be set to true if the comment is created by a Moderator user in the moderator pages; CommentBean.java - set moderated flag when the comment is created, only set if the user is doing this on the moderator pages and has the moderator role; ResearcherQueriesBean.java - ensure moderator mode is deactivated for the user, we can not make sure the user bean set this correctly to false; OwnerQueriesBean.java - ensure moderator mode is deactivated for the user, we can not make sure the user bean set this correctly to false; ModeratorQueriesBean.java - new Bean copied from OwnerQueriesBean.java, with find/replace; (ugly...) ModeratorQueriesDetailBean.java - new Bean copied from OwnerQueriesDetailBean.java, with find/replace; (ugly...) AdminDebugBean.java - add the flag for moderator when a query is transferred in the comment; * global.properties - removed excess colon for moderator pagetitle comment.xhtml - add icon (glyphicon-alert) to mark moderated comments * ReviewBean.java - deactivation of ModeratorMode (just for safety) NetworkBean.java - deactivation of ModeratorMode (just for safety) * ModeratorQueriesBean - switched to use dedicated query DBUtil - added dedicated method for moderator queries * removed collection dropdown for moderators * fixed wrong method call * new table moderators_network * new table moderators_network * Moderators network connection * refactoring * added moderated column on table offer because comment.xhtml is used in request-wide chat and 1:1 chat, leading to an exception in 1:1 chat when there is no moderated column on the table offer. * removed ModeratorNetwork added flag is_moderator on table person changed V22 sql to add moderated columns to offer and comment bugfix in comment.xhtml to display icon and "moderated by" for moderated comments and offers Co-authored-by: RadovanTomik <tomasik@mail.muni.cz>