Merge branch 'master' into 'spidev'

# Conflicts:
#   Layout/default/Device/Detail.php
This commit is contained in:
Daniel Spitzer
2025-12-27 18:33:02 +00:00
213 changed files with 24020 additions and 2713 deletions

View File

@@ -408,7 +408,7 @@ foreach ($devicesall as $deviceall) {
</div>
</div>
<?php
if ($devicesconfig->success == "true" && $devicesconfig->data > count()) {
if ($devicesconfig->success == "true" && $devicesconfig->data > 0) {
?>
<div>
<table class="table table-sm">
@@ -711,7 +711,7 @@ foreach ($devicesall as $deviceall) {
</div>
</div>
</div>
<?php if ($devices->devicetype->devicemanufactor->config_backup > count()):
<?php if ($devices->devicetype->devicemanufactor->config_backup > 0):
$year = date("Y", time());
$month = date("n", time());