github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-25 09:35:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3555 from techAPJ/patch-1

Browse Source 
FIX: use session instead of cookie to preserve url
This commit is contained in:
Arpit Jalan 2015-06-16 13:13:13 +05:30
commit 8feca88cf7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@ -76,13 +76,16 @@ export default DiscourseController.extend(ModalFunctionality, {
// Trigger the browser's password manager using the hidden static login form: // Trigger the browser's password manager using the hidden static login form:
var $hidden_login_form = $('#hidden-login-form'); var $hidden_login_form = $('#hidden-login-form');
var destinationUrl = $.cookie('destination_url'); var destinationUrl = $.cookie('destination_url');
var shouldRedirectToUrl = self.session.get("shouldRedirectToUrl");
$hidden_login_form.find('input[name=username]').val(self.get('loginName')); $hidden_login_form.find('input[name=username]').val(self.get('loginName'));
$hidden_login_form.find('input[name=password]').val(self.get('loginPassword')); $hidden_login_form.find('input[name=password]').val(self.get('loginPassword'));
if ((self.get('loginRequired') || $.cookie('shouldRedirectToUrl')) && destinationUrl) { if (self.get('loginRequired') && destinationUrl) {
// redirect client to the original URL // redirect client to the original URL
$.cookie('destination_url', null); $.cookie('destination_url', null);
$.cookie('shouldRedirectToUrl', null);
$hidden_login_form.find('input[name=redirect]').val(destinationUrl); $hidden_login_form.find('input[name=redirect]').val(destinationUrl);
} else if (shouldRedirectToUrl) {
self.session.set("shouldRedirectToUrl", null);
$hidden_login_form.find('input[name=redirect]').val(shouldRedirectToUrl);
} else { } else {
$hidden_login_form.find('input[name=redirect]').val(window.location.href); $hidden_login_form.find('input[name=redirect]').val(window.location.href);
} }

2
app/assets/javascripts/discourse/routes/new-topic.js.es6
View File

@ -13,7 +13,7 @@ export default Discourse.Route.extend({
}); });
} else { } else {
// User is not logged in // User is not logged in
$.cookie('shouldRedirectToUrl', true); self.session.set("shouldRedirectToUrl", window.location.href);
self.replaceWith('login'); self.replaceWith('login');
} }
} }