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

Merge branch 'MDL-53451-master-fixup3' of https://github.com/FMCorz/moodle

Browse source
This commit is contained in:
David Monllao 2016-04-22 12:59:59 +08:00
commit c047386123
7 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
admin/tool/lp/lib.php
View file

@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
* @param context $coursecontext The context of the course
*/
function tool_lp_extend_navigation_course($navigation, $course, $coursecontext) {
if (!\core_competency\api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return;
}
@ -61,7 +61,7 @@ function tool_lp_extend_navigation_course($navigation, $course, $coursecontext)
* @param context_course $coursecontext The context of the course
*/
function tool_lp_extend_navigation_user($navigation, $user, $usercontext, $course, $coursecontext) {
if (!\core_competency\api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return;
}
@ -88,7 +88,7 @@ function tool_lp_extend_navigation_user($navigation, $user, $usercontext, $cours
* @return bool
*/
function tool_lp_myprofile_navigation(core_user\output\myprofile\tree $tree, $user, $iscurrentuser, $course) {
if (!\core_competency\api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return false;
} else if (!\core_competency\plan::can_read_user($user->id)) {
return false;
@ -109,7 +109,7 @@ function tool_lp_myprofile_navigation(core_user\output\myprofile\tree $tree, $us
* @param context $coursecategorycontext The context of the course category
*/
function tool_lp_extend_navigation_category_settings($navigation, $coursecategorycontext) {
if (!\core_competency\api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return false;
}
@ -160,7 +160,7 @@ function tool_lp_extend_navigation_category_settings($navigation, $coursecategor
function tool_lp_coursemodule_standard_elements($formwrapper, $mform) {
global $CFG, $COURSE;
if (!\core_competency\api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return;
} else if (!has_capability('moodle/competency:coursecompetencymanage', $formwrapper->get_context())) {
return;
@ -195,7 +195,7 @@ function tool_lp_coursemodule_standard_elements($formwrapper, $mform) {
* @param stdClass $course The course.
*/
function tool_lp_coursemodule_edit_post_actions($data, $course) {
if (!\core_competency\api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return $data;
}

2
admin/tool/lp/settings.php
View file

@ -28,7 +28,7 @@ defined('MOODLE_INTERNAL') || die();
$parentname = 'competencies';
// If the plugin is enabled we add the pages.
if (\core_competency\api::is_enabled()) {
if (get_config('core_competency', 'enabled')) {
// Manage competency frameworks page.
$temp = new admin_externalpage(

2
admin/tool/lpmigrate/settings.php
View file

@ -23,7 +23,7 @@
*/
defined('MOODLE_INTERNAL') || die();
if (\core_competency\api::is_enabled()) {
if (get_config('core_competency', 'enabled')) {
$parentname = 'competencies';

2
blocks/lp/block_lp.php
View file

@ -62,7 +62,7 @@ class block_lp extends block_base {
}
$this->content = new stdClass();
if (!\core_competency\api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return $this->content;
}

4
competency/classes/api.php
View file

@ -49,6 +49,10 @@ class api {
/**
* Returns whether competencies are enabled.
*
* This method should never do more than checking the config setting, the reason
* being that some other code could be checking the config value directly
* to avoid having to load this entire file into memory.
*
* @return boolean True when enabled.
*/
public static function is_enabled() {

8
competency/lib.php
View file

@ -40,7 +40,7 @@ use core_competency\user_evidence;
function core_competency_comment_add($comment, $params) {
global $USER;
if (!api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return;
}
@ -215,7 +215,7 @@ function core_competency_comment_add($comment, $params) {
* @return array
*/
function core_competency_comment_permissions($params) {
if (!api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return array('post' => false, 'view' => false);
}
@ -241,7 +241,7 @@ function core_competency_comment_permissions($params) {
* @return bool
*/
function core_competency_comment_validate($params) {
if (!api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return false;
}
@ -274,7 +274,7 @@ function core_competency_comment_validate($params) {
function core_competency_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options = array()) {
global $CFG;
if (!api::is_enabled()) {
if (!get_config('core_competency', 'enabled')) {
return false;
}

4
report/competency/lib.php
View file

@ -34,6 +34,10 @@ defined('MOODLE_INTERNAL') || die;
* @param stdClass $context The context of the course
*/
function report_competency_extend_navigation_course($navigation, $course, $context) {
if (!get_config('core_competency', 'enabled')) {
return;
}
if (has_capability('moodle/competency:coursecompetencyview', $context)) {
$url = new moodle_url('/report/competency/index.php', array('id' => $course->id));
$name = get_string('pluginname', 'report_competency');