Add jump to first review button on discussion list page; fix comment post action menu

Author: justusdieckmann

classes/review.php

@@ -78,32 +78,34 @@ public static function get_short_review_info_for_discussion(int $discussionid) {
     }
 
     /**
-     * @param $afterpostid
+     * @param int $moodleoverflowid ID of moodleoverflow to look in.
+     * @param int $afterpostid ID of post after which to look for the first post to review.
      * @return string|null
      */
-    public static function get_first_review_post($afterpostid = null) {
+    public static function get_first_review_post($moodleoverflowid, $afterpostid = null) {
         global $DB;
 
-        $params = [];
+        $params = ['moodleoverflowid' => $moodleoverflowid];
         $orderby = '';
         $addwhere = '';
 
         if ($afterpostid) {
             $afterdiscussionid = $DB->get_field('moodleoverflow_posts', 'discussion', ['id' => $afterpostid],
                 MUST_EXIST);
 
-            $orderby = 'CASE WHEN (discussion > :afterdiscussionid OR (discussion = :afterdiscussionid2 AND id > :afterpostid)) THEN 0 ELSE 1 END, ';
+            $orderby = 'CASE WHEN (p.discussion > :afterdiscussionid OR (p.discussion = :afterdiscussionid2 AND p.id > :afterpostid)) THEN 0 ELSE 1 END, ';
             $params['afterdiscussionid'] = $afterdiscussionid;
             $params['afterdiscussionid2'] = $afterdiscussionid;
             $params['afterpostid'] = $afterpostid;
 
-            $addwhere = ' AND id != :notpostid ';
+            $addwhere = ' AND p.id != :notpostid ';
             $params['notpostid'] = $afterpostid;
         }
         $record = $DB->get_record_sql(
-            'SELECT id as postid, discussion as discussionid FROM {moodleoverflow_posts} ' .
-            "WHERE reviewed = 0 $addwhere " .
-            "ORDER BY $orderby discussion, id " .
+            'SELECT p.id as postid, p.discussion as discussionid FROM {moodleoverflow_posts} p ' .
+            'JOIN {moodleoverflow_discussions} d ON d.id = p.discussion ' .
+            "WHERE p.reviewed = 0 AND d.moodleoverflow = :moodleoverflowid $addwhere " .
+            "ORDER BY $orderby p.discussion, p.id " .
             'LIMIT 1',
             $params
         );

externallib.php

@@ -206,7 +206,7 @@ public static function review_approve_post($postid) {
             $DB->update_record('moodleoverflow_discussions', $discussion);
         }
 
-        return review::get_first_review_post($post->id);
+        return review::get_first_review_post($moodleoverflow->id, $post->id);
     }
 
     /**
@@ -293,7 +293,7 @@ public static function review_reject_post($postid, $reason = null) {
                 $OUTPUT->render_from_template('mod_moodleoverflow/email_rejected_html', $htmlcontext)
         );
 
-        $url = review::get_first_review_post($post->id);
+        $url = review::get_first_review_post($moodleoverflow->id, $post->id);
 
         if (!$post->parent) {
             // Delete discussion, if this is the question.

locallib.php

@@ -141,7 +141,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = -
         $buttontext = get_string('addanewdiscussion', 'moodleoverflow');
         $buttonurl = new moodle_url('/mod/moodleoverflow/post.php', ['moodleoverflow' => $moodleoverflow->id]);
         $button = new single_button($buttonurl, $buttontext, 'get');
-        $button->class = 'singlebutton moodleoverflowaddnew';
+        $button->class = 'singlebutton align-middle m-2';
         $button->formid = 'newdiscussionform';
         echo $OUTPUT->render($button);
     }

templates/comment.mustache

@@ -100,7 +100,7 @@
             {{/statusstarter}}
             <div class="post-info">
                 <div class="leftbox {{ questioner }}"><span class="text-muted">{{{ byname }}} - {{ byshortdate }}</span></div>
-                <div class="rightbox">{{{ commands }}}</div>
+                <div class="rightbox post-menu">{{{ commands }}}</div>
             </div>
         </div>
     </div>

view.php

@@ -105,6 +105,14 @@
     echo $OUTPUT->box(format_module_intro('moodleoverflow', $moodleoverflow, $cm->id), 'generalbox', 'intro');
 }
 
+if (has_capability('mod/moodleoverflow:reviewpost', $context)) {
+    $reviewpost = \mod_moodleoverflow\review::get_first_review_post($moodleoverflow->id);
+
+    if ($reviewpost) {
+        echo html_writer::link($reviewpost, get_string('review_needed', 'mod_moodleoverflow'), ['class' => 'btn btn-danger']);
+    }
+}
+
 // Return here after posting, etc.
 $SESSION->fromdiscussion = qualified_me();