Include child assets in account assets view

Author: marcusmoore

app/Http/Controllers/ViewAssetsController.php

@@ -41,6 +41,14 @@ public function getIndex() : View | RedirectResponse
             'licenses',
         )->find(auth()->id());
 
+        if (Setting::getSettings()->show_assigned_assets) {
+            $user->load([
+                'assets.assignedAssets',
+                'assets.assignedAssets.model',
+                'assets.assignedAssets.model.fieldset.fields',
+            ]);
+        }
+
         $field_array = array();
 
         // Loop through all the custom fields that are applied to any model the user has assigned
@@ -58,6 +66,20 @@ public function getIndex() : View | RedirectResponse
                 }
             }
 
+            foreach ($asset->assignedAssets as $assignedAsset) {
+                // Make sure the model has a custom fieldset before trying to loop through the associated fields
+                if ($assignedAsset->model->fieldset) {
+
+                    foreach ($assignedAsset->model->fieldset->fields as $field) {
+                        // check and make sure they're allowed to see the value of the custom field
+                        if ($field->display_in_user_view == '1') {
+                            $field_array[$field->db_column] = $field->name;
+                        }
+
+                    }
+                }
+            }
+
         }
 
         // Since some models may re-use the same fieldsets/fields, let's make the array unique so we don't repeat columns

resources/views/account/view-assets.blade.php

@@ -455,15 +455,14 @@ class="table table-striped snipe-table"
 
                     </thead>
                     <tbody>
-                    @php
-                      $counter = 1
-                    @endphp
                     @foreach ($user->assets as $asset)
-                      <x-asset-table-row :asset="$asset" :field_array="$field_array" :counter="$counter" />
+                      <x-asset-table-row :asset="$asset" :field_array="$field_array" :counter="$loop->iteration" />
 
-                      @php
-                        $counter++
-                      @endphp
+                      @if ($settings->show_assigned_assets && $asset->assignedAssets->count())
+                        @foreach($asset->assignedAssets as $assignedAsset)
+                            <x-asset-table-row :asset="$assignedAsset" :field_array="$field_array" :counter="$loop->parent->iteration . '.' . $loop->iteration" />
+                        @endforeach
+                      @endif
                     @endforeach
                     </tbody>
                   </table>