Merge branch 'MDL-64360-master' of https://github.com/lucaboesch/moodle

mod/assign/classes/output/grading_app.php

@@ -170,7 +170,8 @@ class grading_app implements templatable, renderable {
         // List of identity fields to display (the user info will not contain any fields the user cannot view anyway).
         $export->showuseridentity = $CFG->showuseridentity;
         $export->currentuserid = $USER->id;
-
+        $helpicon = new \help_icon('sendstudentnotifications', 'assign');
+        $export->helpicon = $helpicon->export_for_template($output);
         return $export;
     }
 

mod/assign/lang/en/assign.php

@@ -459,7 +459,7 @@ $string['search:activity'] = 'Assignment - activity information';
 $string['sendstudentnotificationsdefault'] = 'Default setting for "Notify students"';
 $string['sendstudentnotificationsdefault_help'] = 'Set the default value for the "Notify students" checkbox on the grading form.';
 $string['sendstudentnotifications'] = 'Notify students';
-$string['sendstudentnotifications_help'] = 'If enabled, students receive a message about the updated grade or feedback.';
+$string['sendstudentnotifications_help'] = 'If enabled, students receive a message about the updated grade or feedback. If marking workflow is enabled in this assignment, notifications will not be sent until the grade is "Released".';
 $string['sendnotifications'] = 'Notify graders about submissions';
 $string['sendnotifications_help'] = 'If enabled, graders (usually teachers) receive a message whenever a student submits an assignment, early, on time and late. Message methods are configurable.';
 $string['selectlink'] = 'Select...';

mod/assign/templates/grading_actions.mustache

@@ -35,6 +35,9 @@
            <input type="checkbox" name="sendstudentnotifications"
                   {{#defaultsendnotifications}}checked="checked"{{/defaultsendnotifications}} />
     </label>
+    {{#helpicon}}
+        {{>core/help_icon}}
+    {{/helpicon}}
     <button type="submit" class="btn btn-primary" name="savechanges">{{#str}}savechanges{{/str}}</button>
     <button type="submit" class="btn btn-primary" name="saveandshownext">{{#str}}saveandnext{{/str}}</button>
     <button type="submit" class="btn" name="resetbutton">{{#str}}reset{{/str}}</button>

theme/boost/templates/mod_assign/grading_actions.mustache

@@ -44,6 +44,9 @@
            <input type="checkbox" name="sendstudentnotifications"
                   {{#defaultsendnotifications}}checked="checked"{{/defaultsendnotifications}} />
     </label>
+    {{#helpicon}}
+        {{>core/help_icon}}
+    {{/helpicon}}
     <button type="submit" class="btn btn-primary" name="savechanges">{{#str}}savechanges{{/str}}</button>
     <button type="submit" class="btn btn-primary" name="saveandshownext">{{#str}}saveandnext{{/str}}</button>
     <button type="submit" class="btn btn-secondary" name="resetbutton">{{#str}}reset{{/str}}</button>