Merge branch '4.13' into 4

This commit is contained in:
github-actions 2023-09-29 11:04:25 +00:00
commit aa3d0a3b6a

View File

@ -2,17 +2,32 @@
* File: ReportAdmin.js * File: ReportAdmin.js
*/ */
(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);