Merge branch 'MDL-41895-m25' of https://github.com/micaherne/moodle into MOODLE_25_STABLE

lang/en/condition.php

@@ -82,6 +82,7 @@ $string['requires_grade_any'] = 'Not available until you have a grade in <strong
 $string['requires_grade_max'] = 'Not available unless you get an appropriate score in <strong>{$a}</strong>.';
 $string['requires_grade_min'] = 'Not available until you achieve a required score in <strong>{$a}</strong>.';
 $string['requires_grade_range'] = 'Not available unless you get a particular score in <strong>{$a}</strong>.';
+$string['requires_grouping'] = 'Available only to grouping <strong>{$a}</strong>.';
 $string['requires_user_field_contains'] = 'Not available unless your <strong>{$a->field}</strong> contains <strong>{$a->value}</strong>.';
 $string['requires_user_field_doesnotcontain'] = 'Not available if your <strong>{$a->field}</strong> contains <strong>{$a->value}</strong>.';
 $string['requires_user_field_endswith'] = 'Not available unless your <strong>{$a->field}</strong> ends with <strong>{$a->value}</strong>.';

lib/conditionlib.php

@@ -361,6 +361,19 @@ class condition_info_section extends condition_info_base {
     protected function get_context() {
         return context_course::instance($this->item->course);
     }
+
+    public function get_full_information($modinfo=null) {
+        $information = parent::get_full_information($modinfo);
+
+        // Grouping conditions.
+        if ($this->item->groupingid > 0) {
+            $information .= get_string(
+                    'requires_grouping',
+                    'condition', groups_get_grouping_name($this->item->groupingid));
+        }
+
+        return $information;
+    }
 }
 
 
@@ -777,7 +790,6 @@ abstract class condition_info_base {
 
         $information = '';
 
-
         // Completion conditions
         if (count($this->item->conditionscompletion) > 0) {
             if ($this->item->course == $COURSE->id) {