From 122c85387cb88cf8a746ef131e0d7e49593bbc50 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Thu, 27 Aug 2020 17:32:46 -0600 Subject: [PATCH] Fix incorrect client ID indexes --- langs/en/events.json | 3 ++- lib/Machine.lib.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/langs/en/events.json b/langs/en/events.json index ed44fad..405af31 100644 --- a/langs/en/events.json +++ b/langs/en/events.json @@ -1,4 +1,5 @@ { "Date": "Date", - "Technician": "Technician" + "Technician": "Technician", + "Event": "Event" } diff --git a/lib/Machine.lib.php b/lib/Machine.lib.php index a5ee30b..b057284 100644 --- a/lib/Machine.lib.php +++ b/lib/Machine.lib.php @@ -68,7 +68,7 @@ class Machine implements JsonSerializable { "components" => $this->components, "formdata" => [ "options" => [ - "clientid" => array_merge(["" => ""], Clients::getAllAsIDNameArray()), + "clientid" => ["" => ""] + Clients::getAllAsIDNameArray(), "type" => Machine::getTypeList() ], "inputtypes" => [