Remerge
This commit is contained in:
@@ -270,5 +270,4 @@ if ($devices->power != "0.0") {
|
|||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
|
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
|
||||||
@@ -5,7 +5,6 @@ foreach ($devicetypes as $devicetype) {
|
|||||||
}
|
}
|
||||||
asort($deviceTypes);
|
asort($deviceTypes);
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
|
<link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
|
||||||
<!-- start page title -->
|
<!-- start page title -->
|
||||||
|
|||||||
@@ -5,9 +5,6 @@ $pagination_entity_name = "Device";
|
|||||||
?>
|
?>
|
||||||
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
|
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
|
||||||
<link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
|
<link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
|
||||||
<style>
|
|
||||||
|
|
||||||
</style>
|
|
||||||
<!-- start page title -->
|
<!-- start page title -->
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
|
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
|
||||||
|
|
||||||
<!-- start page title -->
|
<!-- start page title -->
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ $pagination_entity_name = "Devicemanufactor";
|
|||||||
</div>
|
</div>
|
||||||
<!-- end page title -->
|
<!-- end page title -->
|
||||||
|
|
||||||
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body mb-3">
|
<div class="card-body mb-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ class Device extends mfBaseModel
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->$name;
|
return $this->$name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
class DeviceController extends mfBaseController
|
class DeviceController extends mfBaseController
|
||||||
{
|
{
|
||||||
|
|
||||||
protected function init()
|
protected function init()
|
||||||
{
|
{
|
||||||
$this->needlogin = true;
|
$this->needlogin = true;
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ class DeviceModel
|
|||||||
|
|
||||||
public static function find($data)
|
public static function find($data)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function create(array $data)
|
public static function create(array $data)
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
class Devicemanufactor extends mfBaseModel
|
class Devicemanufactor extends mfBaseModel
|
||||||
{
|
{
|
||||||
private $editor;
|
private $editor;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
class DevicemanufactorController extends mfBaseController
|
class DevicemanufactorController extends mfBaseController
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
class DevicemanufactorModel {
|
class DevicemanufactorModel {
|
||||||
public $name = null;
|
public $name = null;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user