L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-34945-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-09-06 20:12:22 +02:00
parent e7920065ac 1461ecc0e4
commit 09cca2d7aa
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/lib.php
+6
View File
@@ -1281,6 +1281,12 @@ abstract class repository {
$types = repository::get_editable_types($context);
foreach ($types as $type) {
if (!empty($type) && $type->get_visible()) {
// If the user does not have the permission to view the repository, it won't be displayed in
// the list of instances. Hiding the link to create new instances will prevent the
// user from creating them without being able to find them afterwards, which looks like a bug.
if (!has_capability('repository/'.$type->get_typename().':view', $context)) {
continue;
}
$instanceoptionnames = repository::static_function($type->get_typename(), 'get_instance_option_names');
if (!empty($instanceoptionnames)) {
$baseurl->param('new', $type->get_typename());
repository/manage_instances.php
+10 -6
View File
@@ -106,12 +106,16 @@ if (!empty($new)){
$type = repository::get_type_by_id($instance->options['typeid']);
}
if (isset($type) && !$type->get_visible()) {
print_error('typenotvisible', 'repository', $baseurl);
}
if (isset($type) && !$type->get_contextvisibility($context)) {
print_error('usercontextrepositorydisabled', 'repository', $baseurl);
if (isset($type)) {
if (!$type->get_visible()) {
print_error('typenotvisible', 'repository', $baseurl);
}
// Prevents the user from creating/editing an instance if the repository is not visible in
// this context OR if the user does not have the capability to view this repository in this context.
$canviewrepository = has_capability('repository/'.$type->get_typename().':view', $context);
if (!$type->get_contextvisibility($context) || !$canviewrepository) {
print_error('usercontextrepositorydisabled', 'repository', $baseurl);
}
}
/// Create navigation links