Merge branch 'MDL-52154-master-wip2' of https://github.com/xow/moodle

mpetrowi · Apr 29, 2016 · 5ea0c56 · 5ea0c56
2 parents 4871514 + af9d3a9
commit 5ea0c56
Show file tree

Hide file tree

Showing 55 changed files with 5,170 additions and 153 deletions.
diff --git a/mod/lti/ajax.php b/mod/lti/ajax.php
@@ -48,38 +48,42 @@
         require_capability('moodle/course:manageactivities', $context);
         require_capability('mod/lti:addinstance', $context);
 
-        if (empty($toolid) && !empty($toolurl)) {
-            $tool = lti_get_tool_by_url_match($toolurl, $courseid);
+        if (!empty($toolurl) && lti_is_cartridge($toolurl)) {
+            $response->cartridge = true;
+        } else {
+            if (empty($toolid) && !empty($toolurl)) {
+                $tool = lti_get_tool_by_url_match($toolurl, $courseid);
 
-            if (!empty($tool)) {
-                $toolid = $tool->id;
+                if (!empty($tool)) {
+                    $toolid = $tool->id;
 
-                $response->toolid = $tool->id;
-                $response->toolname = s($tool->name);
-                $response->tooldomain = s($tool->tooldomain);
+                    $response->toolid = $tool->id;
+                    $response->toolname = s($tool->name);
+                    $response->tooldomain = s($tool->tooldomain);
+                }
+            } else {
+                $response->toolid = $toolid;
             }
-        } else {
-            $response->toolid = $toolid;
-        }
 
-        if (!empty($toolid)) {
-            // Look up privacy settings.
-            $query = '
-                SELECT name, value
-                FROM {lti_types_config}
-                WHERE
-                    typeid = :typeid
-                AND name IN (\'sendname\', \'sendemailaddr\', \'acceptgrades\')
-            ';
+            if (!empty($toolid)) {
+                // Look up privacy settings.
+                $query = '
+                    SELECT name, value
+                    FROM {lti_types_config}
+                    WHERE
+                        typeid = :typeid
+                    AND name IN (\'sendname\', \'sendemailaddr\', \'acceptgrades\')
+                ';
 
-            $privacyconfigs = $DB->get_records_sql($query, array('typeid' => $toolid));
-            $success = count($privacyconfigs) > 0;
-            foreach ($privacyconfigs as $config) {
-                $configname = $config->name;
-                $response->$configname = $config->value;
-            }
-            if (!$success) {
-                $response->error = s(get_string('tool_config_not_found', 'mod_lti'));
+                $privacyconfigs = $DB->get_records_sql($query, array('typeid' => $toolid));
+                $success = count($privacyconfigs) > 0;
+                foreach ($privacyconfigs as $config) {
+                    $configname = $config->name;
+                    $response->$configname = $config->value;
+                }
+                if (!$success) {
+                    $response->error = s(get_string('tool_config_not_found', 'mod_lti'));
+                }
             }
         }
 

diff --git a/mod/lti/amd/build/cartridge_registration_form.min.js b/mod/lti/amd/build/cartridge_registration_form.min.js
diff --git a/mod/lti/amd/build/events.min.js b/mod/lti/amd/build/events.min.js
diff --git a/mod/lti/amd/build/external_registration.min.js b/mod/lti/amd/build/external_registration.min.js
diff --git a/mod/lti/amd/build/external_registration_return.min.js b/mod/lti/amd/build/external_registration_return.min.js
diff --git a/mod/lti/amd/build/keys.min.js b/mod/lti/amd/build/keys.min.js
@@ -0,0 +1 @@
+define([],function(){return{ENTER:13,SPACE:32}});
diff --git a/mod/lti/amd/build/tool_card_controller.min.js b/mod/lti/amd/build/tool_card_controller.min.js
diff --git a/mod/lti/amd/build/tool_configure_controller.min.js b/mod/lti/amd/build/tool_configure_controller.min.js
diff --git a/mod/lti/amd/build/tool_proxy.min.js b/mod/lti/amd/build/tool_proxy.min.js
diff --git a/mod/lti/amd/build/tool_type.min.js b/mod/lti/amd/build/tool_type.min.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		define([],function(){return{ENTER:13,SPACE:32}});