Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'RaspberryDisplay/v2-init' into 'master'

Browse Source 
fixed sending new url

See merge request fronk/thetool!2085
This commit is contained in:
Luca Haid
2026-02-03 15:09:56 +00:00
parent 05aba91c33 3aa7008aa4
commit 9bd3184d74
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/RaspberryDisplay/RaspberryDisplayController.php
View File

@@ -101,12 +101,22 @@ class RaspberryDisplayController extends mfBaseController {
$display = RaspberryDisplayModel::get((int)$this->request->id); $display = RaspberryDisplayModel::get((int)$this->request->id);
if (!$display) return false; if (!$display) return false;
$oldUrl = $display->display_url;
$oldHdmiPort = (int)$display->hdmi_port;
foreach (['display_label', 'hostname', 'ip_address', 'display_url', 'group_name', 'group_order', 'monitor_size', 'hdmi_port', 'agent_port', 'custom_style'] as $field) { foreach (['display_label', 'hostname', 'ip_address', 'display_url', 'group_name', 'group_order', 'monitor_size', 'hdmi_port', 'agent_port', 'custom_style'] as $field) {
if (isset($this->request->$field)) $display->$field = $this->request->$field; if (isset($this->request->$field)) $display->$field = $this->request->$field;
} }
$display->edit_by = $this->me->id; $display->edit_by = $this->me->id;
$display->edit = time(); $display->edit = time();
RaspberryDisplayModel::save($display); RaspberryDisplayModel::save($display);
$newUrl = $display->display_url;
if ($newUrl !== $oldUrl && !empty($newUrl)) {
NocDisplayAgent::fromDisplay(['ip_address' => $display->ip_address, 'agent_port' => $display->agent_port])
->setUrl((int)$display->hdmi_port, $newUrl);
}
return true; return true;
} }