Skip to content

Commit

Permalink
MDL-63210 core: touch-up after review
Browse files Browse the repository at this point in the history
1. Reworded the string.
2. Removed logic handling form data.
3. Do not use window.location.replace.

Backport of MDL-54551.
  • Loading branch information
mdjnelson committed Aug 23, 2018
1 parent 24342e7 commit a456850
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion lang/en/webservice.php
Expand Up @@ -186,7 +186,7 @@
$string['servicehelpexplanation'] = 'A service is a set of functions. A service can be accessed by all users or just specified users.';
$string['servicename'] = 'Service name';
$string['servicenotavailable'] = 'Web service is not available (it doesn\'t exist or might be disabled)';
$string['servicerequireslogin'] = 'Web service requires login (the session has been logged out or has expired. Please save any work on the current page before continuing)';
$string['servicerequireslogin'] = 'Web service is not available (the session has been logged out or has expired)';
$string['servicesbuiltin'] = 'Built-in services';
$string['servicescustom'] = 'Custom services';
$string['serviceusers'] = 'Authorised users';
Expand Down
2 changes: 1 addition & 1 deletion lib/amd/build/ajax.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 2 additions & 8 deletions lib/amd/src/ajax.js
Expand Up @@ -25,7 +25,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @since 2.9
*/
define(['jquery', 'core/config', 'core/log', 'core/yui', 'core/url'], function($, config, Log, Y, URL) {
define(['jquery', 'core/config', 'core/log', 'core/url'], function($, config, Log, URL) {

// Keeps track of when the user leaves the page so we know not to show an error.
var unloading = false;
Expand Down Expand Up @@ -81,13 +81,7 @@ define(['jquery', 'core/config', 'core/log', 'core/yui', 'core/url'], function($
if (exception !== null) {
// If the user isn't doing anything too important, redirect to the login page.
if (exception.errorcode === "servicerequireslogin") {
Y.use('moodle-core-formchangechecker', function() {
if (!M.core_formchangechecker.get_form_dirty_state()) {
// If we reach here, the user isn't editing anything on the page.
var loginUrl = URL.relativeUrl("/login/index.php");
window.location.replace(loginUrl);
}
});
window.location = URL.relativeUrl("/login/index.php");
} else {
for (; i < requests.length; i++) {
request = requests[i];
Expand Down

0 comments on commit a456850

Please sign in to comment.