show mac_address on devices when not null, ensure hardware_name_overr…

…ide is updatable
fablabbcn · Feb 28, 2024 · fa8394d · fa8394d
1 parent 8e49e7b
commit fa8394d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/app/controllers/v0/devices_controller.rb b/app/controllers/v0/devices_controller.rb
@@ -86,6 +86,7 @@ def device_params
       params_to_permit = [
         :name,
         :description,
+        :hardware_name_override,
         :mac_address,
         :latitude,
         :longitude,

diff --git a/app/views/v0/devices/_device.jbuilder b/app/views/v0/devices/_device.jbuilder
@@ -26,6 +26,7 @@ authorized = !local_assigns[:never_authorized] && current_user && (current_user.
 
 if authorized
   json.merge! device_token: device.device_token
+  json.merge! mac_address: device.mac_address if device.mac_address
 else
   json.merge! device_token: '[FILTERED]'
 end