mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge branch '5.0' into 5.1
This commit is contained in:
commit
f0347e5921
@ -3,16 +3,31 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
(function ($) {
|
(function ($) {
|
||||||
$.entwine('ss', function($){
|
$.entwine("ss", function ($) {
|
||||||
$('.ReportAdmin .cms-edit-form').entwine({
|
$(".ReportAdmin .cms-edit-form").entwine({
|
||||||
onsubmit: function (e) {
|
onsubmit: function (e) {
|
||||||
var url = $.path.parseUrl(document.location.href).hrefNoSearch,
|
let url = $.path.parseUrl(document.location.href).hrefNoSearch;
|
||||||
params = this.find(':input[name^=filters]').serializeArray();
|
let params = this.find(":input[name^=filters]").serializeArray();
|
||||||
params = $.grep(params, function(param) {return (param.value);}); // filter out empty
|
|
||||||
if(params) url = $.path.addSearchParams(url, $.param(params));
|
try {
|
||||||
$('.cms-container').loadPanel(url);
|
params = $.grep(params, function (param) {
|
||||||
return false;
|
// filter out empty
|
||||||
|
return param.value;
|
||||||
|
});
|
||||||
|
|
||||||
|
// convert params to a query string
|
||||||
|
params = $.param(params);
|
||||||
|
|
||||||
|
// append query string to url
|
||||||
|
url += "?" + params;
|
||||||
|
|
||||||
|
$(".cms-container").loadPanel(url);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
})(jQuery);
|
})(jQuery);
|
||||||
|
Loading…
Reference in New Issue
Block a user