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

MDL-49754 mod_lti: Fixes to JSON format

Browse Source 
@id elements in JSON corrected to match the IMS spec.  Version number of
the service updated.
This commit is contained in:
spvickers 2015-04-05 11:05:20 +01:00 committed by John Okely
parent b611ade3ab
commit 82f5226576
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/lti/service/toolsettings/classes/local/resource/contextsettings.php
View File

@ -50,7 +50,7 @@ class contextsettings extends \mod_lti\local\ltiservice\resource_base {
parent::__construct($service);
$this->id = 'ToolProxyBindingSettings';
$this->template = '/{context_type}/{context_id}/bindings/{vendor_code}/{product_code}/custom';
$this->template = '/{context_type}/{context_id}/bindings/{vendor_code}/{product_code}';
$this->variables[] = 'ToolProxyBinding.custom.url';
$this->formats[] = 'application/vnd.ims.lti.v2.toolsettings+json';
$this->formats[] = 'application/vnd.ims.lti.v2.toolsettings.simple+json';
@ -135,6 +135,7 @@ class contextsettings extends \mod_lti\local\ltiservice\resource_base {
}
if ($ok) {
$settings = $json->{"@graph"}[0]->custom;
unset($settings->{'@id'});
}
} else { // Simple JSON.
$json = json_decode($response->get_request_data(), true);

3
mod/lti/service/toolsettings/classes/local/resource/linksettings.php
View File

@ -51,7 +51,7 @@ class linksettings extends \mod_lti\local\ltiservice\resource_base {
parent::__construct($service);
$this->id = 'LtiLinkSettings';
$this->template = '/links/{link_id}/custom';
$this->template = '/links/{link_id}';
$this->variables[] = 'LtiLink.custom.url';
$this->formats[] = 'application/vnd.ims.lti.v2.toolsettings+json';
$this->formats[] = 'application/vnd.ims.lti.v2.toolsettings.simple+json';
@ -165,6 +165,7 @@ class linksettings extends \mod_lti\local\ltiservice\resource_base {
}
if ($ok) {
$settings = $json->{"@graph"}[0]->custom;
unset($settings->{'@id'});
}
} else { // Simple JSON.
$json = json_decode($response->get_request_data(), true);

3
mod/lti/service/toolsettings/classes/local/resource/systemsettings.php
View File

@ -49,7 +49,7 @@ class systemsettings extends \mod_lti\local\ltiservice\resource_base {
parent::__construct($service);
$this->id = 'ToolProxySettings';
$this->template = '/toolproxy/{tool_proxy_id}/custom';
$this->template = '/toolproxy/{tool_proxy_id}';
$this->variables[] = 'ToolProxy.custom.url';
$this->formats[] = 'application/vnd.ims.lti.v2.toolsettings+json';
$this->formats[] = 'application/vnd.ims.lti.v2.toolsettings.simple+json';
@ -113,6 +113,7 @@ class systemsettings extends \mod_lti\local\ltiservice\resource_base {
}
if ($ok) {
$settings = $json->{"@graph"}[0]->custom;
unset($settings->{'@id'});
}
} else { // Simple JSON.
$json = json_decode($response->get_request_data(), true);

8
mod/lti/service/toolsettings/classes/local/service/toolsettings.php
View File

@ -111,15 +111,15 @@ class toolsettings extends \mod_lti\local\ltiservice\service_base {
if (!$simpleformat) {
$json .= " {\n \"@type\":\"{$type}\",\n";
$json .= " \"@id\":\"{$resource->get_endpoint()}\",\n";
$json .= ' "custom":';
$json .= "{";
$json .= " \"custom\":{\n";
$json .= " \"@id\":\"{$resource->get_endpoint()}/custom\"";
$indent = ' ';
}
$isfirst = true;
$isfirst = $simpleformat;
if (!empty($settings)) {
foreach ($settings as $key => $value) {
if (!$isfirst) {
$json .= ",";
$json .= ',';
} else {
$isfirst = false;
}

2
mod/lti/service/toolsettings/version.php
View File

@ -27,7 +27,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2015111600;
$plugin->version = 2016041200;
$plugin->requires = 2015111000;
$plugin->component = 'ltiservice_toolsettings';
$plugin->dependencies = array(