From e535179c3ea3bce35316f2eba5137b1822a3f568 Mon Sep 17 00:00:00 2001 From: Kevin Dibble Date: Mon, 25 Mar 2019 16:48:28 +1300 Subject: [PATCH] bug 1798203: Peer review prevents viewing objectionable content Updated view to allow the user admin to view content if it has reported objectionable content. behatnotneeded Change-Id: I277902b5a6121c5daaa6f692dcc391e9ef99caf8 (cherry picked from commit 39d4428671c8292bb2c3335d869278753608ef58) --- htdocs/blocktype/lib.php | 4 ++++ htdocs/view/view.php | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/blocktype/lib.php b/htdocs/blocktype/lib.php index 0d3ab9be5e..1dd6952da4 100644 --- a/htdocs/blocktype/lib.php +++ b/htdocs/blocktype/lib.php @@ -1178,6 +1178,10 @@ class BlockInstance { $classname = generate_class_name('blocktype', $this->get('blocktype')); $displayforrole = call_static_method($classname, 'display_for_roles', $user_roles); + $checkview = $this->get_view(); + if ($USER->is_admin_for_user($checkview->get('owner')) && $checkview->is_objectionable()) { + $displayforrole = true; + } if (!$displayforrole) { $content = ''; $smarty->assign('loadbyajax', false); diff --git a/htdocs/view/view.php b/htdocs/view/view.php index 97fb05a2d6..1d7c68a98f 100644 --- a/htdocs/view/view.php +++ b/htdocs/view/view.php @@ -333,7 +333,8 @@ if ($owner && $owner == $USER->get('id')) { // Don't show page content to a user with peer role // if the view doesn't have a peer assessment block -if (!$USER->has_peer_role_only($view) || $view->has_peer_assessement_block()) { +if (!$USER->has_peer_role_only($view) || $view->has_peer_assessement_block() + || ($USER->is_admin_for_user($view->get('owner')) && $view->is_objectionable())) { $viewcontent = $view->build_rows(); // Build content before initialising smarty in case pieform elements define headers. } -- GitLab