Reworked Device Module and Vue Components

application/Devicemanufactor/DevicemanufactorController.php

@@ -17,11 +17,7 @@ class DevicemanufactorController extends mfBaseController
 
     protected function indexAction()
     {
-
-        $this->layout()->setTemplate("Devicemanufactor/Index");
-        $devicemanufactors = DevicemanufactorModel::getAll();
-        $this->layout()->set("devicemanufactors", $devicemanufactors);
-
+        $this->redirect("Device");
     }
 
     protected function addAction()
@@ -36,17 +32,17 @@ class DevicemanufactorController extends mfBaseController
 
         if (!is_numeric($id) || !$id) {
             $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
 
         $devicemanufactors = new Devicemanufactor($id);
         if ($devicemanufactors->id != $id) {
             $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
 
         $this->layout()->set("devicemanufactors", $devicemanufactors);
-        return $this->addAction();
+        $this->addAction();
     }
 
     protected function saveAction()
@@ -59,7 +55,7 @@ class DevicemanufactorController extends mfBaseController
             $devicemanufactor = new Devicemanufactor($id);
             if (!$devicemanufactor->id) {
                 $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
-                $this->redirect("Devicemanufactor");
+                $this->redirect("Device");;
             }
         } else {
             $mode = "add";
@@ -72,7 +68,7 @@ class DevicemanufactorController extends mfBaseController
 
         if (!$data['name']) {
             $this->layout()->setFlash("Name darf nicht leer sein", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");;
         }
 
 
@@ -93,9 +89,9 @@ class DevicemanufactorController extends mfBaseController
 
         if (!$id) {
             $this->layout()->setFlash("Gerätehersteller konnte nicht angelegt werden", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
-        if ($fsh) {
+        if (isset($fsh) && $fsh) {
             $fsh->save();
         }
         if ($mode == "edit") {
@@ -103,7 +99,7 @@ class DevicemanufactorController extends mfBaseController
         } else if ($mode = "add") {
             $this->layout()->setFlash("Gerätehersteller erfolgreich angelegt", "success");
         }
-        $this->redirect("Devicemanufactor");
+        $this->redirect("Device");
     }
 
     protected function deleteAction()
@@ -112,11 +108,12 @@ class DevicemanufactorController extends mfBaseController
         $devicemanufactor = new Devicemanufactor($id);
         if (!$devicemanufactor->id || $devicemanufactor->id != $id) {
             $this->layout()->setFlash("Gerätehersteller nicht gefunden.", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
 
         $devicemanufactor->delete();
-        $this->redirect("Devicemanufactor");
+        $this->layout()->setFlash("Gerätehersteller erfolgreich gelöscht", "success");
+        $this->redirect("Device");
     }
 
 }