diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix destination export to honor Show All across domains (#7936)

Browse Source 
When SHOW ALL button has been pressed then export all destinations from all domains and add '_all' to the exported file name.
This commit is contained in:
Mendel
2026-04-29 19:35:30 -04:00
committed by GitHub
parent 6a37970e12
commit 368ad20227
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/destinations/destination_download.php
+11 -4
View File
@@ -144,13 +144,17 @@
}
}
if (is_array($selected_columns) && @sizeof($selected_columns) != 0) {
$show_all = (!empty($_REQUEST['show']) && $_REQUEST['show'] == 'all' && permission_exists('destination_all'));
$sql = "select ".implode(', ', $selected_columns)." from v_destinations ";
$sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$destinations = $database->select($sql, $parameters, 'all');
if (!$show_all) {
$sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
}
$destinations = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters, $selected_columns);
download_send_headers("destination_export_".date("Y-m-d").".csv");
$filename_suffix = $show_all ? '_all' : '';
download_send_headers("destination_export".$filename_suffix."_".date("Y-m-d").".csv");
echo array2csv($destinations);
exit;
}
@@ -166,6 +170,9 @@
//show the content
echo "<form method='post' name='frm' id='frm'>\n";
if (!empty($_REQUEST['show']) && $_REQUEST['show'] == 'all' && permission_exists('destination_all')) {
echo "<input type='hidden' name='show' value='all'>\n";
}
echo "<div class='action_bar' id='action_bar'>\n";
echo " <div class='heading'><b>".$text['header-destination_export']."</b></div>\n";
echo " <div class='actions'>\n";
app/destinations/destinations.php
+1 -1
View File
@@ -289,7 +289,7 @@
echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$settings->get('theme', 'button_icon_import'),'link'=>'destination_imports.php']);
}
if (permission_exists('destination_export')) {
echo button::create(['type'=>'button','label'=>$text['button-export'],'icon'=>$settings->get('theme', 'button_icon_export'),'link'=>'destination_download.php']);
echo button::create(['type'=>'button','label'=>$text['button-export'],'icon'=>$settings->get('theme', 'button_icon_export'),'link'=>'destination_download.php'.($show == 'all' ? '?show=all' : null)]);
}
if (permission_exists('destination_add')) {
echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','style'=>'margin-left: 15px;','link'=>'destination_edit.php?type='.urlencode($destination_type)]);