Commit fd22ee72 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1540534: Apply the moderation setting from view to its artefacts"

parents be184111 74ee809f
...@@ -151,7 +151,10 @@ EOF; ...@@ -151,7 +151,10 @@ EOF;
$javascript = array('paginator', 'viewmenu'); $javascript = array('paginator', 'viewmenu');
if ($artefact->get('allowcomments') && ( $USER->is_logged_in() || (!$USER->is_logged_in() && get_config('anonymouscomments')))) { if ($artefact->get('allowcomments') && ( $USER->is_logged_in() || (!$USER->is_logged_in() && get_config('anonymouscomments')))) {
$addfeedbackform = pieform(ArtefactTypeComment::add_comment_form(false, $artefact->get('approvecomments'))); $commenttype = $view->user_comments_allowed($USER);
$moderate = isset($commenttype) && $commenttype === 'private';
$addfeedbackform = pieform(ArtefactTypeComment::add_comment_form(false, $moderate));
} }
$objectionform = pieform(objection_form()); $objectionform = pieform(objection_form());
if ($notrudeform = notrude_form()) { if ($notrudeform = notrude_form()) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment