Mobile Integration,Pop Multiple Networks,DataTables responsible update,Migrations
Mobile Integration: * in footer.php js eingefügt damit das mobile Menu funktioniert * in menu.php bzw. app.css neue Klasse eingefügt mobile-hide um in der mobilen Version Menupünkte zu verstecken Pop Multiple Networks * Pops können nun mehrere Netzgebiete haben * Netzgebiete und Pop ansicht angepasst * (Script muss ausgeführt werden um die PopNetwork Table vom Bestand zu befüllen) DataTables responsible update * Datatables update und responsible addon * Diverse Anpassungen für Responsible in: - Pops, Geräte Hersteller, Geräte Typen, Devices, Benutzer Migrations * PopNetwork * Poprackmodulepatch
This commit is contained in:
@@ -21,7 +21,8 @@ class PopController extends mfBaseController
|
||||
{
|
||||
|
||||
$this->layout()->setTemplate("Pop/Index");
|
||||
$pops = PopModel::getAll();
|
||||
$pops = PopModel::getAlladv();
|
||||
|
||||
$this->layout()->set("pops", $pops);
|
||||
|
||||
}
|
||||
@@ -40,7 +41,8 @@ class PopController extends mfBaseController
|
||||
$this->layout()->setFlash("Pop nicht gefunden", "error");
|
||||
$this->redirect("Pop");
|
||||
}
|
||||
|
||||
$popnetwork = PopNetworkModel::getbyPopid($id);
|
||||
$this->layout()->set("popnetwork", implode(', ' , $popnetwork['name']));
|
||||
$this->layout()->setTemplate("Pop/Detail");
|
||||
$filter['pop_id'] = $id;
|
||||
$this->layout()->set("popracks", PoprackModel::getAllbyPop($id));
|
||||
@@ -76,6 +78,8 @@ class PopController extends mfBaseController
|
||||
$this->redirect("Network");
|
||||
}
|
||||
|
||||
$popnetwork = PopNetworkModel::getbyPopid($id);
|
||||
$this->layout()->set("popnetwork", $popnetwork['network_id']);
|
||||
$this->layout()->set("pop", $pop);
|
||||
return $this->addAction();
|
||||
}
|
||||
@@ -106,7 +110,8 @@ class PopController extends mfBaseController
|
||||
}
|
||||
|
||||
$data = [];
|
||||
$data['network_id'] = $r->network_id;
|
||||
|
||||
|
||||
$data['name'] = $r->name;
|
||||
$data['gps_lat'] = ($r->gps_lat) ? $r->gps_lat : null;
|
||||
$data['gps_long'] = ($r->gps_long) ? $r->gps_long : null;
|
||||
@@ -127,11 +132,34 @@ class PopController extends mfBaseController
|
||||
|
||||
|
||||
$new_id = $pop->save();
|
||||
|
||||
|
||||
if (!$new_id) {
|
||||
$this->layout()->setFlash("Fehler beim Speichern", "error");
|
||||
$this->layout()->set("network", $network);
|
||||
return $this->addAction();
|
||||
}
|
||||
|
||||
if ($r->network_id) {
|
||||
$oldPopnetworks = json_encode(PopNetworkModel::getbyPopid($new_id));
|
||||
|
||||
|
||||
$result = array_diff($r->network_id, $oldPopnetworks);
|
||||
|
||||
if ($oldPopnetworks != json_encode($r->network_id)) {
|
||||
PopNetworkModel::deletebyPopid($new_id);
|
||||
unset($data);
|
||||
$data = [];
|
||||
foreach ($r->network_id as $networkid) {
|
||||
$data['network_id'] = $networkid;
|
||||
$data['pop_id'] = $new_id;
|
||||
$popNetwork = PopNetworkModel::create($data);
|
||||
$popNetwork->save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($this->request->returnto) {
|
||||
$returnAction = "Index";
|
||||
$returnVariables = array();
|
||||
|
||||
Reference in New Issue
Block a user