mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
rating MDL-26274 made rating_ajax.php use the current scale rather than the scale from the users previously submitted rating
This commit is contained in:
parent
d911c72bf9
commit
66cb20f6c0
@ -141,10 +141,10 @@ $aggregatetoreturn = round($items[0]->rating->aggregate,1);
|
||||
// Output a dash if aggregation method == COUNT as the count is output next to the aggregate anyway
|
||||
if ($items[0]->rating->settings->aggregationmethod==RATING_AGGREGATE_COUNT or $items[0]->rating->count == 0) {
|
||||
$aggregatetoreturn = ' - ';
|
||||
} else if($rating->scaleid < 0) { //if its non-numeric scale
|
||||
} else if($items[0]->rating->settings->scale->id < 0) { //if its non-numeric scale
|
||||
//dont use the scale item if the aggregation method is sum as adding items from a custom scale makes no sense
|
||||
if ($items[0]->rating->settings->aggregationmethod!= RATING_AGGREGATE_SUM) {
|
||||
$scalerecord = $DB->get_record('scale', array('id' => -$rating->scaleid));
|
||||
$scalerecord = $DB->get_record('scale', array('id' => -$items[0]->rating->settings->scale->id));
|
||||
if ($scalerecord) {
|
||||
$scalearray = explode(',', $scalerecord->scale);
|
||||
$aggregatetoreturn = $scalearray[$aggregatetoreturn-1];
|
||||
|
Loading…
x
Reference in New Issue
Block a user