From f3380a771cffc56bfa5be9566456945869a32da5 Mon Sep 17 00:00:00 2001
From: Spitzer_Daniel <daniel.spitzer@inode.at>
Date: Wed, 22 Mar 2023 16:24:42 +0100
Subject: [PATCH] Remerge

---
 Layout/default/Device/Detail.php          | 2 +-
 Layout/default/Device/Form.php            | 2 +-
 Layout/default/Device/Index.php           | 4 ++--
 Layout/default/Devicemanufactor/Index.php | 4 ++--
 Layout/default/Devicetype/Form.php        | 2 +-
 Layout/default/Devicetype/Index.php       | 4 ++--
 application/Device/Device.php             | 1 -
 application/Device/DeviceController.php   | 1 -
 application/Device/DeviceModel.php        | 1 -
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Layout/default/Device/Detail.php b/Layout/default/Device/Detail.php
index 98eb19cfa..3ee27f889 100644
--- a/Layout/default/Device/Detail.php
+++ b/Layout/default/Device/Detail.php
@@ -2,7 +2,7 @@
 
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
     <style>
         .card-border {
 
diff --git a/Layout/default/Device/Form.php b/Layout/default/Device/Form.php
index c38f0d53c..f3821541a 100644
--- a/Layout/default/Device/Form.php
+++ b/Layout/default/Device/Form.php
@@ -7,7 +7,7 @@ asort($deviceTypes);
 
 
 ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css" rel="stylesheet" type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
diff --git a/Layout/default/Device/Index.php b/Layout/default/Device/Index.php
index 589f8bf2c..a873d5f48 100644
--- a/Layout/default/Device/Index.php
+++ b/Layout/default/Device/Index.php
@@ -4,7 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Device";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css" rel="stylesheet" type="text/css" />
+    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
     <style>
 
     </style>
@@ -135,7 +135,7 @@ $pagination_entity_name = "Device";
 
         });
     </script>
-    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js"></script>
+    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js?<?=date('U')?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Devicemanufactor/Index.php b/Layout/default/Devicemanufactor/Index.php
index ce8eb742c..9b4a11186 100644
--- a/Layout/default/Devicemanufactor/Index.php
+++ b/Layout/default/Devicemanufactor/Index.php
@@ -4,7 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Devicemanufactor";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -88,7 +88,7 @@ $pagination_entity_name = "Devicemanufactor";
 
         });
     </script>
-    <script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js"></script>
+    <script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?=date('U')?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Devicetype/Form.php b/Layout/default/Devicetype/Form.php
index ac4f20d18..db799cdcf 100644
--- a/Layout/default/Devicetype/Form.php
+++ b/Layout/default/Devicetype/Form.php
@@ -1,5 +1,5 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?=self::getResourcePath()?>assets/css/select2-cstm.css" rel="stylesheet" type="text/css" />
+    <link href="<?=self::getResourcePath()?>assets/css/select2-cstm.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
diff --git a/Layout/default/Devicetype/Index.php b/Layout/default/Devicetype/Index.php
index f09a21d50..d36b5e3ea 100644
--- a/Layout/default/Devicetype/Index.php
+++ b/Layout/default/Devicetype/Index.php
@@ -4,7 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Devicetype";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css" rel="stylesheet" type="text/css" />
+    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -106,7 +106,7 @@ $pagination_entity_name = "Devicetype";
 
         });
     </script>
-    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js"></script>
+    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js?<?=date('U')?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/application/Device/Device.php b/application/Device/Device.php
index 178f165fc..4abccfb32 100644
--- a/application/Device/Device.php
+++ b/application/Device/Device.php
@@ -1,5 +1,4 @@
 <?php
-
 class Device extends mfBaseModel
 {
     private $editor;
diff --git a/application/Device/DeviceController.php b/application/Device/DeviceController.php
index 0a11dc525..695aae919 100644
--- a/application/Device/DeviceController.php
+++ b/application/Device/DeviceController.php
@@ -1,5 +1,4 @@
 <?php
-
 class DeviceController extends mfBaseController
 {
 
diff --git a/application/Device/DeviceModel.php b/application/Device/DeviceModel.php
index 8c9de7072..f64b286b5 100644
--- a/application/Device/DeviceModel.php
+++ b/application/Device/DeviceModel.php
@@ -1,5 +1,4 @@
 <?php
-
 class DeviceModel
 {
     public $name = null;