From e1e1aad183a66ebc8e51aa428d1322df4fed4c87 Mon Sep 17 00:00:00 2001 From: John Okely Date: Fri, 20 May 2016 12:05:55 +0800 Subject: [PATCH] MDL-53988 mod_lti: Remove popup for duplicate url If creating a proxy fails, we will show an error using the notification API. So we can remove the notification.exception call. But modify the docs for ToolProxy.create so that future developers will know they need to handle failures themselves. --- mod/lti/amd/build/tool_proxy.min.js | 2 +- mod/lti/amd/src/tool_proxy.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/lti/amd/build/tool_proxy.min.js b/mod/lti/amd/build/tool_proxy.min.js index f7db8dcd1ec..10dd482a2c1 100644 --- a/mod/lti/amd/build/tool_proxy.min.js +++ b/mod/lti/amd/build/tool_proxy.min.js @@ -1 +1 @@ -define(["core/ajax","core/notification"],function(a,b){return{query:function(c){var d={methodname:"mod_lti_get_tool_proxies",args:c||{}},e=a.call([d])[0];return e.fail(b.exception),e},"delete":function(c){var d={methodname:"mod_lti_delete_tool_proxy",args:{id:c}},e=a.call([d])[0];return e.fail(b.exception),e},create:function(c){var d={methodname:"mod_lti_create_tool_proxy",args:c},e=a.call([d])[0];return e.fail(b.exception),e}}}); \ No newline at end of file +define(["core/ajax","core/notification"],function(a,b){return{query:function(c){var d={methodname:"mod_lti_get_tool_proxies",args:c||{}},e=a.call([d])[0];return e.fail(b.exception),e},"delete":function(c){var d={methodname:"mod_lti_delete_tool_proxy",args:{id:c}},e=a.call([d])[0];return e.fail(b.exception),e},create:function(b){var c={methodname:"mod_lti_create_tool_proxy",args:b},d=a.call([c])[0];return d}}}); \ No newline at end of file diff --git a/mod/lti/amd/src/tool_proxy.js b/mod/lti/amd/src/tool_proxy.js index 8bc62b3edb6..1ca0fad53e3 100644 --- a/mod/lti/amd/src/tool_proxy.js +++ b/mod/lti/amd/src/tool_proxy.js @@ -75,6 +75,8 @@ define(['core/ajax', 'core/notification'], function(ajax, notification) { /** * Create a tool proxy in Moodle. * + * The promise will fail if the proxy cannot be created, so you must handle the fail result. + * * See mod/lti/classes/external.php create_tool_proxy_parameters * * @method create @@ -90,8 +92,6 @@ define(['core/ajax', 'core/notification'], function(ajax, notification) { var promise = ajax.call([request])[0]; - promise.fail(notification.exception); - return promise; } };