moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-67038_master' of git://github.com/dmonllao/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-10-31 00:28:45 +01:00
commit 61bf77ff9a
4 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/tool/analytics/model.php
View file

@ -159,6 +159,10 @@ switch ($action) {
$predictionsprocessor = false; $predictionsprocessor = false;
} }
if (!isset($data->contexts)) {
$data->contexts = null;
}
$model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor, $data->contexts); $model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor, $data->contexts);
redirect($returnurl); redirect($returnurl);
} }

8
analytics/classes/model.php
View file

@ -493,13 +493,15 @@ class model {
$predictionsprocessor = $this->model->predictionsprocessor; $predictionsprocessor = $this->model->predictionsprocessor;
} }
if ($contextids !== false) { if ($contextids === false) {
$contextsstr = $this->model->contextids;
} else if (!$contextids) {
$contextsstr = null;
} else {
$contextsstr = json_encode($contextids); $contextsstr = json_encode($contextids);
// Reset the internal cache. // Reset the internal cache.
$this->contexts = null; $this->contexts = null;
} else {
$contextsstr = $this->model->contextids;
} }
if ($this->model->timesplitting !== $timesplittingid || if ($this->model->timesplitting !== $timesplittingid ||

9
lib/db/upgrade.php
View file

@ -3754,5 +3754,14 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2019102500.04); upgrade_main_savepoint(true, 2019102500.04);
} }
if ($oldversion < 2019103000.13) {
$DB->execute("UPDATE {analytics_models} set contextids = null
WHERE contextids = :zero or contextids = :null", ['zero' => '0', 'null' => 'null']);
// Main savepoint reached.
upgrade_main_savepoint(true, 2019103000.13);
}
return true; return true;
} }

2
version.php
View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2019103000.01; // YYYYMMDD = weekly release date of this DEV branch. $version = 2019103000.13; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches. // RR = release increments - 00 in DEV branches.
// .XX = incremental changes. // .XX = incremental changes.