tonyair/silverstripe-translatable
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-translatable synced 2024-10-22 11:05:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101 from tractorcow/master-querystring-fixes

Browse Source 
BUG Cleaner handling of querystring arguments when selecting locale
This commit is contained in:
Ingo Schommer 2013-04-11 00:56:46 -07:00
commit ba31412fa8
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controller/TranslatableCMSMainExtension.php
View File

@ -40,7 +40,7 @@ class TranslatableCMSMainExtension extends Extension {
$req->param('Action'),
$req->param('ID'),
$req->param('OtherID'),
'?' . http_build_query($getVars)
($query = http_build_query($getVars)) ? "?$query" : null
));
}
}

17
javascript/CMSMain.Translatable.js
View File

@ -36,10 +36,19 @@
this._super();
},
onchange: function(e) {
var url = $.path.addSearchParams(
document.location.href.replace(/locale=[^&]*/, ''),
{locale: $(e.target).val()}
);
// Get new locale code
locale = {locale: $(e.target).val()};
// Check existing url
search = /locale=[^&]*/;
url = document.location.href;
if(url.match(search)) {
// Replace locale code
url = url.replace(search, $.param(locale));
} else {
// Add locale code
url = $.path.addSearchParams(url, locale);
}
$('.cms-container').loadPanel(url);
return false;
}