From a69ce80f8637ac37266a16970af9b139606aa310 Mon Sep 17 00:00:00 2001
From: Cam Proudlock <cam.proudlock@gmail.com>
Date: Wed, 29 Jul 2026 09:08:01 -0400
Subject: [PATCH] fix: blank location dropdowns + require printer model

---
 plugins/computers/frontend/views/PCForm.vue       |  2 +-
 .../network/frontend/views/NetworkDeviceForm.vue  |  2 +-
 .../network/frontend/views/NetworkDevicesList.vue |  2 +-
 plugins/network/frontend/views/SubnetsList.vue    |  2 +-
 plugins/printers/frontend/views/PrinterForm.vue   | 15 +++++++++++++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/plugins/computers/frontend/views/PCForm.vue b/plugins/computers/frontend/views/PCForm.vue
index 36ce5170..b4cf50dc 100644
--- a/plugins/computers/frontend/views/PCForm.vue
+++ b/plugins/computers/frontend/views/PCForm.vue
@@ -149,7 +149,7 @@
                 :key="l.locationid"
                 :value="l.locationid"
               >
-                {{ l.location }}
+                {{ l.locationname }}
               </option>
             </select>
           </div>
diff --git a/plugins/network/frontend/views/NetworkDeviceForm.vue b/plugins/network/frontend/views/NetworkDeviceForm.vue
index 30237ce7..3488cca5 100644
--- a/plugins/network/frontend/views/NetworkDeviceForm.vue
+++ b/plugins/network/frontend/views/NetworkDeviceForm.vue
@@ -81,7 +81,7 @@
               <select id="locationid" v-model="form.locationid" class="form-control">
                 <option value="">Select Location</option>
                 <option v-for="loc in locations" :key="loc.locationid" :value="loc.locationid">
-                  {{ loc.location }}
+                  {{ loc.locationname }}
                 </option>
               </select>
             </div>
diff --git a/plugins/network/frontend/views/NetworkDevicesList.vue b/plugins/network/frontend/views/NetworkDevicesList.vue
index 4ad93920..89add4fb 100644
--- a/plugins/network/frontend/views/NetworkDevicesList.vue
+++ b/plugins/network/frontend/views/NetworkDevicesList.vue
@@ -42,7 +42,7 @@
       <select v-model="locationFilter" class="form-control" @change="loadDevices">
         <option value="">All Locations</option>
         <option v-for="loc in locations" :key="loc.locationid" :value="loc.locationid">
-          {{ loc.location }}
+          {{ loc.locationname }}
         </option>
       </select>
     </div>
diff --git a/plugins/network/frontend/views/SubnetsList.vue b/plugins/network/frontend/views/SubnetsList.vue
index e65abaa8..fd9e2872 100644
--- a/plugins/network/frontend/views/SubnetsList.vue
+++ b/plugins/network/frontend/views/SubnetsList.vue
@@ -148,7 +148,7 @@
                   <select id="locationid" v-model="form.locationid" class="form-control">
                     <option value="">Select Location</option>
                     <option v-for="loc in locations" :key="loc.locationid" :value="loc.locationid">
-                      {{ loc.location }}
+                      {{ loc.locationname }}
                     </option>
                   </select>
                 </div>
diff --git a/plugins/printers/frontend/views/PrinterForm.vue b/plugins/printers/frontend/views/PrinterForm.vue
index 91c34fe5..75a1edc6 100644
--- a/plugins/printers/frontend/views/PrinterForm.vue
+++ b/plugins/printers/frontend/views/PrinterForm.vue
@@ -144,12 +144,13 @@
           </div>
 
           <div class="form-group">
-            <label for="modelnumberid">Model</label>
+            <label for="modelnumberid">Model *</label>
             <select
               id="modelnumberid"
               v-model="form.modelnumberid"
               class="form-control"
               :disabled="!form.vendorid"
+              required
             >
               <option value="">{{ form.vendorid ? 'Select model...' : 'Select a vendor first' }}</option>
               <option
@@ -179,7 +180,7 @@
               :key="l.locationid"
               :value="l.locationid"
             >
-              {{ l.location }}
+              {{ l.locationname }}
             </option>
           </select>
         </div>
@@ -549,6 +550,16 @@ function clearMapPosition() {
 
 async function savePrinter() {
   error.value = ''
+
+  // Model is required. The native `required` on the select is skipped while it
+  // is disabled (no vendor picked), so guard here too and point at the vendor.
+  if (!form.value.modelnumberid) {
+    error.value = form.value.vendorid
+      ? 'Model is required.'
+      : 'Select a vendor, then a model (model is required).'
+    return
+  }
+
   saving.value = true
 
   try {