Merge branch 'fronkdev' into 'master'
Fixed AddressDB export button See merge request fronk/thetool!702
This commit is contained in:
@@ -407,13 +407,13 @@ class AddressDBController extends mfBaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected function exportAction() {
|
protected function exportAction() {
|
||||||
return $this->export();
|
return $this->exportAddressdb();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function exportHomesAction() {
|
protected function exportHomesAction() {
|
||||||
return $this->export(true);
|
return $this->exportAddressdb(true);
|
||||||
}
|
}
|
||||||
private function export($export_homes = false) {
|
private function exportAddressdb($export_homes = false) {
|
||||||
$rfilter = $this->request->filter;
|
$rfilter = $this->request->filter;
|
||||||
if(!is_array($rfilter)) {
|
if(!is_array($rfilter)) {
|
||||||
$rfilter = [];
|
$rfilter = [];
|
||||||
|
|||||||
Reference in New Issue
Block a user