MDL-34346 Correctly set repository current context

This commit is contained in:
Marina Glancy 2013-04-03 11:25:03 +11:00
parent 422f68fb86
commit cfb713519d
3 changed files with 46 additions and 58 deletions

View file

@ -6895,13 +6895,13 @@ class admin_setting_managerepository extends admin_setting {
$table->data = array();
// Get list of used plug-ins
$instances = repository::get_types();
if (!empty($instances)) {
$repositorytypes = repository::get_types();
if (!empty($repositorytypes)) {
// Array to store plugins being used
$alreadyplugins = array();
$totalinstances = count($instances);
$totalrepositorytypes = count($repositorytypes);
$updowncount = 1;
foreach ($instances as $i) {
foreach ($repositorytypes as $i) {
$settings = '';
$typename = $i->get_typename();
// Display edit link only if you can config the type or if it has multiple instances (e.g. has instance config)
@ -6924,9 +6924,10 @@ class admin_setting_managerepository extends admin_setting {
$userinstances = array();
foreach ($instances as $instance) {
if ($instance->context->contextlevel == CONTEXT_COURSE) {
$repocontext = context::instance_by_id($instance->instance->contextid);
if ($repocontext->contextlevel == CONTEXT_COURSE) {
$courseinstances[] = $instance;
} else if ($instance->context->contextlevel == CONTEXT_USER) {
} else if ($repocontext->contextlevel == CONTEXT_USER) {
$userinstances[] = $instance;
}
}
@ -6975,7 +6976,7 @@ class admin_setting_managerepository extends admin_setting {
else {
$updown .= $spacer;
}
if ($updowncount < $totalinstances) {
if ($updowncount < $totalrepositorytypes) {
$updown .= "<a href=\"$this->baseurl&amp;action=movedown&amp;repos=".$typename."\">";
$updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" class=\"iconsmall\" /></a>";
}