From 5bda89d7f2469b4175b3a9ac1815ad7da47b5f49 Mon Sep 17 00:00:00 2001
From: phpipam <miha.petkovsek@telemach.si>
Date: Tue, 19 Dec 2023 16:37:48 +0100
Subject: [PATCH] Added option to export data for VLAN,VRF and Devices directly
from tools page #3962
---
app/tools/devices/all-devices.php | 8 ++++++++
app/tools/vlan/domains.php | 6 ++++++
app/tools/vrf/all_vrf.php | 8 ++++++++
js/magic.js | 8 ++++++--
misc/CHANGELOG | 1 +
5 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/app/tools/devices/all-devices.php b/app/tools/devices/all-devices.php
index fb027442..c6d0b195 100755
--- a/app/tools/devices/all-devices.php
+++ b/app/tools/devices/all-devices.php
@@ -60,6 +60,14 @@ print "<div class='btn-group'>";
print "<a href='".create_link("administration", "device-types")."' class='btn btn-sm btn-default'><i class='fa fa-tablet'></i> "._('Manage device types')."</a>";
print "</div>";
+if($User->get_module_permissions ("devices")>=User::ACCESS_RW) {
+ print '<div class="btn-group pull-right" style="margin-bottom:10px;">';
+ print ' <div class="hidden"><select name="dataType"><option value="devices" selected="selected">Devices</option></select></div>';
+ print ' <button class="dataExport btn btn-sm btn-default" rel="tooltip" data-placement="bottom" title="" data-original-title="Export data entries for the selected type"><i class="fa fa-download"></i> Export</button>';
+ print '</div>';
+ print '<div class="clearfix"></div>';
+}
+
# filter
include_once ("all-devices-filter.php");
diff --git a/app/tools/vlan/domains.php b/app/tools/vlan/domains.php
index fef1c38b..3cf6fc3a 100644
--- a/app/tools/vlan/domains.php
+++ b/app/tools/vlan/domains.php
@@ -16,6 +16,12 @@ $User->check_module_permissions ("vlan", User::ACCESS_R, true, false);
<?php } ?>
</div>
+<?php if($User->get_module_permissions ("vlan")>=User::ACCESS_RWA) { ?>
+<div class="btn-group pull-right" style="margin-bottom:10px;">
+ <div class="hidden"><select name="dataType"><option value='vlan' selected="selected">VLAN</option></select></div>
+ <button class="dataExport btn btn-sm btn-default" rel="tooltip" data-placement="bottom" title="" data-original-title="Export data entries for the selected type"><i class="fa fa-download"></i> Export</button>
+</div>
+<?php } ?>
<table class="table sorted nosearch nopagination table-striped table-top table-condensed table-auto-wide" data-cookie-id-table='tools_l2_all'>
<!-- headers -->
diff --git a/app/tools/vrf/all_vrf.php b/app/tools/vrf/all_vrf.php
index adf23e64..093aeee8 100755
--- a/app/tools/vrf/all_vrf.php
+++ b/app/tools/vrf/all_vrf.php
@@ -33,8 +33,16 @@ $custom_size = sizeof($custom) - sizeof($hidden_fields);
if($User->is_admin(false)===true && $User->settings->enableSNMP==1) { ?>
<button class="btn btn-sm btn-default" id="snmp-vrf" data-action="add"><i class="fa fa-cogs"></i> <?php print _('Scan for VRFs'); ?></button>
<?php } ?>
+</div>
+<?php if($User->get_module_permissions ("vrf")>=User::ACCESS_RW) { ?>
+<div class="btn-group pull-right" style="margin-bottom:10px;">
+ <div class="hidden"><select name="dataType"><option value='vrf' selected="selected">VRF</option></select></div>
+ <button class="dataExport btn btn-sm btn-default" rel="tooltip" data-placement="bottom" title="" data-original-title="Export data entries for the selected type"><i class="fa fa-download"></i> Export</button>
</div>
+<div class="clearfix"></div>
+<?php } ?>
+
<!-- vrfs -->
<?php
diff --git a/js/magic.js b/js/magic.js
index 75eee28f..a571dd48 100755
--- a/js/magic.js
+++ b/js/magic.js
@@ -2638,10 +2638,14 @@ $('button#XLSdump, button#MySQLdump, button#hostfileDump').click(function () {
//Export Section
$('button.dataExport').click(function () {
- var implemented = ["vrf","vlan","subnets","ipaddr", "l2dom", "devices", "devtype"]; var popsize = {};
+ var implemented = ["vrf","vlan","subnets","ipaddr", "l2dom", "devices", "devtype"];
+ var popsize = {};
+ // popup window size definition
popsize["subnets"] = "w700";
- popsize["ipaddr"] = "w700";
+ popsize["ipaddr"] = "w700";
+ popsize["vlan"] = "w700";
popsize["devices"] = "max";
+ // get requested datatype
var dataType = $('select[name=dataType]').find(":selected").val();
hidePopups();
//show popup window
diff --git a/misc/CHANGELOG b/misc/CHANGELOG
index 663cab65..f9eedbce 100755
--- a/misc/CHANGELOG
+++ b/misc/CHANGELOG
@@ -14,6 +14,7 @@
Enhancements, changes:
----------------------------
+ Added support for redundant PowerDNS databases (#3981);
+ + Added option to export data for VLAN,VRF and Devices directly from tools page;
Security Fixes:
----------------------------
--
GitLab