mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-04 16:04:00 +02:00
Code Issues Projects Releases Wiki Activity

Removing course id field admin setting, making cmidnumber advanced in instructor interface, wiring up setting to show tool in creation screen

Browse Source
This commit is contained in:
Chris Scribner 2011-08-30 17:39:28 -04:00
parent d97d72aab9
commit 0d8afb44ee
6 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/blti/db/install.xml
View File

@ -42,7 +42,7 @@
<FIELD NAME="tooldomain" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" PREVIOUS="baseurl" NEXT="state"/>
<FIELD NAME="state" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="2" SEQUENCE="false" COMMENT="Active = 1, Pending = 2, Rejected = 3" PREVIOUS="tooldomain" NEXT="course"/>
<FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" PREVIOUS="state" NEXT="coursevisible"/>
<FIELD NAME="coursevisible" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" PREVIOUS="course" NEXT="createdby"/>
<FIELD NAME="coursevisible" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" DEFAULT="0" PREVIOUS="course" NEXT="createdby"/>
<FIELD NAME="createdby" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" PREVIOUS="coursevisible" NEXT="timecreated"/>
<FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" PREVIOUS="createdby" NEXT="timemodified"/>
<FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" PREVIOUS="timecreated"/>

4
mod/blti/edit_form.php
View File

@ -132,10 +132,6 @@ class mod_blti_edit_types_form extends moodleform{
$idoptions[0] = get_string('id', 'blti');
$idoptions[1] = get_string('courseid', 'blti');
$mform->addElement('select', 'lti_moodle_course_field', get_string('moodle_course_field', 'blti'), $idoptions);
$mform->setDefault('lti_moodle_course_field', '0');
$mform->addElement('text', 'lti_organizationid', get_string('organizationid', 'blti'));
$mform->setType('lti_organizationid', PARAM_TEXT);
// $mform->addHelpButton('lti_organizationid', 'organizationid', 'blti');

1
mod/blti/lang/en/blti.php
View File

@ -118,7 +118,6 @@ $string['module_class_type'] = 'Moodle module type';
$string['modulename'] = 'External Tool';
$string['modulenameplural'] = 'basicltis';
$string['modulenamepluralformatted'] = 'Basic LTI Instances';
$string['moodle_course_field'] = 'Course identification field';
$string['never'] = 'Never';
$string['noattempts'] = 'No attempts have been made on this tool instance';
$string['noservers'] = 'No servers found';

26
mod/blti/locallib.php
View File

@ -97,16 +97,12 @@ function blti_view($instance, $makeobject=false) {
$parms = sign_parameters($requestparams, $endpoint, "POST", $key, $secret, $submittext, $orgid /*, $orgdesc*/);
$debuglaunch = ( $instance->debuglaunch == 1 );
if ( $makeobject ) {
$height = 600;
$content = post_launch_html($parms, $endpoint, $debuglaunch, $height);
} else {
$content = post_launch_html($parms, $endpoint, $debuglaunch, false);
}
$content = post_launch_html($parms, $endpoint, $debuglaunch);
// $cm = get_coursemodule_from_instance("blti", $instance->id);
// print '<object height='.$height.' width="80%" data="launch.php?id='.$cm->id.'">'.$content.'</object>';
print $content;
echo $content;
}
/**
@ -320,7 +316,8 @@ function blti_filter_get_types() {
}
function blti_get_types_for_add_instance(){
$admintypes = blti_filter_get_types();
global $DB;
$admintypes = $DB->get_records('blti_types', array('coursevisible' => 1));
$types = array();
$types[0] = get_string('automatic', 'blti');
@ -548,12 +545,15 @@ function blti_get_type_type_config($id) {
if (isset($config['launchcontainer'])) {
$type->lti_launchcontainer = $config['launchcontainer'];
}
if (isset($config['coursevisible'])) {
$type->lti_coursevisible = $config['coursevisible'];
}
if (isset($config['debuglaunch'])) {
$type->lti_debuglaunch = $config['debuglaunch'];
}
if (isset($config['moodle_course_field'])) {
$type->lti_moodle_course_field = $config['moodle_course_field'];
}
if (isset($config['module_class_type'])) {
$type->lti_module_class_type = $config['module_class_type'];
}
@ -644,7 +644,7 @@ function sign_parameters($oldparms, $endpoint, $method, $oauthconsumerkey, $oaut
* @param $endpoint URL of the external tool
* @param $debug Debug (true/false)
*/
function post_launch_html($newparms, $endpoint, $debug=false, $height=false) {
function post_launch_html($newparms, $endpoint, $debug=false) {
global $lastbasestring;
$r = "<form action=\"".$endpoint."\" name=\"ltiLaunchForm\" id=\"ltiLaunchForm\" method=\"post\" encType=\"application/x-www-form-urlencoded\">\n";

21
mod/blti/mod_form.php
View File

@ -103,6 +103,15 @@ class mod_blti_mod_form extends moodleform_mod {
$mform->addElement('text', 'toolurl', get_string('launch_url', 'blti'), array('size'=>'64'));
$mform->setType('toolurl', PARAM_TEXT);
$launchoptions=array();
$launchoptions[BLTI_LAUNCH_CONTAINER_DEFAULT] = get_string('default', 'blti');
$launchoptions[BLTI_LAUNCH_CONTAINER_EMBED] = get_string('embed', 'blti');
$launchoptions[BLTI_LAUNCH_CONTAINER_EMBED_NO_BLOCKS] = get_string('embed_no_blocks', 'blti');
$launchoptions[BLTI_LAUNCH_CONTAINER_WINDOW] = get_string('new_window', 'blti');
$mform->addElement('select', 'launchcontainer', get_string('launchinpopup', 'blti'), $launchoptions);
$mform->setDefault('launchcontainer', BLTI_LAUNCH_CONTAINER_DEFAULT);
$mform->addElement('text', 'resourcekey', get_string('resourcekey', 'blti'));
$mform->setType('resourcekey', PARAM_TEXT);
$mform->setAdvanced('resourcekey');
@ -115,16 +124,6 @@ class mod_blti_mod_form extends moodleform_mod {
$mform->setType('instructorcustomparameters', PARAM_TEXT);
$mform->setAdvanced('instructorcustomparameters');
$launchoptions=array();
$launchoptions[BLTI_LAUNCH_CONTAINER_DEFAULT] = get_string('default', 'blti');
$launchoptions[BLTI_LAUNCH_CONTAINER_EMBED] = get_string('embed', 'blti');
$launchoptions[BLTI_LAUNCH_CONTAINER_EMBED_NO_BLOCKS] = get_string('embed_no_blocks', 'blti');
$launchoptions[BLTI_LAUNCH_CONTAINER_WINDOW] = get_string('new_window', 'blti');
$mform->addElement('select', 'launchcontainer', get_string('launchinpopup', 'blti'), $launchoptions);
$mform->setDefault('launchcontainer', BLTI_LAUNCH_CONTAINER_DEFAULT);
//-------------------------------------------------------------------------------
//$mform->addElement('hidden', 'typeid', $this->typeid);
//$mform->addElement('hidden', 'toolurl', $this->typeconfig['toolurl']);
@ -166,6 +165,8 @@ class mod_blti_mod_form extends moodleform_mod {
//-------------------------------------------------------------------------------
// add standard elements, common to all modules
$this->standard_coursemodule_elements();
$mform->setAdvanced('cmidnumber');
//-------------------------------------------------------------------------------
// add standard buttons, common to all modules
$this->add_action_buttons();

4
mod/blti/typessettings.php
View File

@ -79,9 +79,11 @@ if ($data = data_submitted() and confirm_sesskey() and isset($data->submitbutton
$type->baseurl = $data->lti_toolurl;
$type->tooldomain = blti_get_domain_from_url($data->lti_toolurl);
$type->course = $SITE->id;
$type->coursevisible = 1;
$type->coursevisible = !empty($data->lti_coursevisible) ? $data->lti_coursevisible : 0;
$type->timemodified = time();
$data->lti_coursevisible = $type->coursevisible;//When not checked, it does not appear in data array. Set it manually.
if (isset($id)) {
$type->id = $id;