Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed saving empty vlans

Browse Source
This commit is contained in:
Frank Schubert
2021-06-29 22:58:11 +02:00
parent 9d643fdfa2
commit 7353885310
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Pop/Pop.php
View File

@@ -1,6 +1,8 @@
<?php
class Pop extends mfBaseModel {
protected $forcestr = ['vlan_public', 'vlan_nat', 'vlan_ipv6'];
private $network;
public function getProperty($name) {

6
application/Pop/PopController.php
View File

@@ -75,9 +75,9 @@ class PopController extends mfBaseController {
$data['gps_lat'] = $r->gps_lat;
$data['gps_long'] = $r->gps_long;
$data['location'] = $r->location;
$data['vlan_public'] = $r->vlan_public;
$data['vlan_nat'] = $r->vlan_nat;
$data['vlan_ipv6'] = $r->vlan_ipv6;
$data['vlan_public'] = ($r->vlan_public) ? $r->vlan_public : null;
$data['vlan_nat'] = ($r->vlan_nat) ? $r->vlan_nat: null;
$data['vlan_ipv6'] = ($r->vlan_ipv6) ? $r->vlan_ipv6: null;
$data['note'] = $r->note;
$data['edit_by'] = 1;

6
application/Pop/PopModel.php
View File

@@ -26,7 +26,11 @@ class PopModel {
foreach($data as $field => $value) {
if(property_exists(get_called_class(), $field)) {
$model ->$field = $value;
if(substr($field, 0, 5) == "vlan_" && !$value) {
$model->$field = null;
continue;
}
$model->$field = $value;
}
}