Merge branch 'MDL-36060-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

This commit is contained in:
Sam Hemelryk
2013-05-01 10:14:09 +12:00
2 changed files with 20 additions and 9 deletions
+17
View File
@@ -573,6 +573,23 @@ function lti_filter_get_types($course) {
return $DB->get_records('lti_types', $filter);
}
/**
* Given an array of tools, filter them based on their state
*
* @param array $tools An array of lti_types records
* @param int $state One of the LTI_TOOL_STATE_* constants
* @return array
*/
function lti_filter_tool_types(array $tools, $state) {
$return = array();
foreach ($tools as $key => $tool) {
if ($tool->state == $state) {
$return[$key] = $tool;
}
}
return $return;
}
function lti_get_types_for_add_instance() {
global $DB, $SITE, $COURSE;
+3 -9
View File
@@ -66,21 +66,15 @@ if ($ADMIN->fulltree) {
$types = lti_filter_get_types(get_site()->id);
$configuredtools = array_filter($types, function($value) {
return $value->state == LTI_TOOL_STATE_CONFIGURED;
});
$configuredtools = lti_filter_tool_types($types, LTI_TOOL_STATE_CONFIGURED);
$configuredtoolshtml = lti_get_tool_table($configuredtools, 'lti_configured');
$pendingtools = array_filter($types, function($value) {
return $value->state == LTI_TOOL_STATE_PENDING;
});
$pendingtools = lti_filter_tool_types($types, LTI_TOOL_STATE_PENDING);
$pendingtoolshtml = lti_get_tool_table($pendingtools, 'lti_pending');
$rejectedtools = array_filter($types, function($value) {
return $value->state == LTI_TOOL_STATE_REJECTED;
});
$rejectedtools = lti_filter_tool_types($types, LTI_TOOL_STATE_REJECTED);
$rejectedtoolshtml = lti_get_tool_table($rejectedtools, 'lti_rejected');