From 0b352fd94e179d166cc5bbf366a8d7fa9e69da45 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Thu, 21 Feb 2013 11:51:21 +0800 Subject: [PATCH] MDL-37770 Assignment submission comments do not work without javascript. This is mostly fixed by MDL-36832 which correctly sets the $PAGE->url. This patch hides the submit and textareas from submission comments in the grading table when javascript is disabled and quickgrading is enabled. This particular combination results in a form nested in a form which does not work (and cannot be fixed in a reasonable amount of time). --- mod/assign/styles.css | 10 ++++++++++ mod/assign/submission/comments/locallib.php | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mod/assign/styles.css b/mod/assign/styles.css index aa3c880382d..16bca8b1bd4 100644 --- a/mod/assign/styles.css +++ b/mod/assign/styles.css @@ -150,3 +150,13 @@ td.submissioneditable { .hidefull { display: none; } + +.quickgradingform form .commentscontainer input, +.quickgradingform form .commentscontainer textarea { + display: none; +} + +.jsenabled .quickgradingform form .commentscontainer input, +.jsenabled .quickgradingform form .commentscontainer textarea { + display: inline; +} diff --git a/mod/assign/submission/comments/locallib.php b/mod/assign/submission/comments/locallib.php index 33f97bec75d..6922ab3dcca 100644 --- a/mod/assign/submission/comments/locallib.php +++ b/mod/assign/submission/comments/locallib.php @@ -71,7 +71,8 @@ class assign_submission_comments extends assign_submission_plugin { $comment = new comment($options); $comment->set_view_permission(true); - return $comment->output(true); + $o = $this->assignment->get_renderer()->container($comment->output(true), 'commentscontainer'); + return $o; } /**