mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-40867 External tools should launch pop-ups from the course page

Browse Source 
Without this fix, if an LTI tool is set to open in a pop-up, then
clicking the link on the course page opens another almost blank page,
which then tries to open the pop-up, which is almost invariably caught
by your pop-up blocker.

With this fix, clicking the link on the course page opens the pop-up
directly, like for pop-up resources.
This commit is contained in:
Tim Hunt 2013-07-25 13:16:41 +01:00
parent bdd045c5ec
commit 3de55d2458
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mod/lti/lib.php
View File

@ -169,7 +169,7 @@ function lti_delete_instance($id) {
* For this module we just need to support external urls as
* activity icons
*
* @param cm_info $coursemodule
* @param stdClass $coursemodule
* @return cached_cm_info info
*/
function lti_get_coursemodule_info($coursemodule) {
@ -177,7 +177,7 @@ function lti_get_coursemodule_info($coursemodule) {
require_once($CFG->dirroot.'/mod/lti/locallib.php');
if (!$lti = $DB->get_record('lti', array('id' => $coursemodule->instance),
'icon, secureicon, intro, introformat, name')) {
'icon, secureicon, intro, introformat, name, toolurl, launchcontainer')) {
return null;
}
@ -196,6 +196,19 @@ function lti_get_coursemodule_info($coursemodule) {
$info->content = format_module_intro('lti', $lti, $coursemodule->id, false);
}
// Does the link open in a new window?
$tool = lti_get_tool_by_url_match($lti->toolurl);
if ($tool) {
$toolconfig = lti_get_type_config($tool->id);
} else {
$toolconfig = array();
}
$launchcontainer = lti_get_launch_container($lti, $toolconfig);
if ($launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW) {
$launchurl = new moodle_url('/mod/lti/launch.php', array('id' => $coursemodule->id));
$info->onclick = "window.open('" . $launchurl->out(false) . "', 'lti'); return false;";
}
$info->name = $lti->name;
return $info;