notes and some playing around, push for eod

snipe · May 1, 2024 · e177993 · e177993
1 parent 6a7f3ec
commit e177993
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -195,6 +195,7 @@ public function edit(Request $request)
  */
  public function update(Request $request)
  {
+ //dd($request->all());
  $this->authorize('update', Asset::class);
  $has_errors = 0;
  $error_array = array();

diff --git a/database/factories/CustomFieldsetFactory.php b/database/factories/CustomFieldsetFactory.php
@@ -58,6 +58,7 @@ public function hasMultipleCustomFields(array $fields = null): self
  {
  return $this->afterCreating(function (CustomFieldset $fieldset) {
  if (empty($fields)) {
+ //why are there two after creating and why does it break if i remove one
  return $this->afterCreating(function (CustomFieldset $fieldset) {
  $mac_address = CustomField::factory()->macAddress()->create();
  $ram = CustomField::factory()->ram()->create();

diff --git a/tests/Feature/Assets/AssetsBulkEditTest.php b/tests/Feature/Assets/AssetsBulkEditTest.php
@@ -86,17 +86,17 @@ public function testBulkEditAssetsAcceptsAndUpdatesUnencryptedCustomFields()
  $ram = CustomField::factory()->ram()->create();
  $cpu = CustomField::factory()->cpu()->create();
 
- $assets = Asset::factory()->laptopMbp()->count(10)->hasMultipleCustomFields([$mac_address, $ram, $cpu])->create([
+ $assets = Asset::factory()->count(10)->hasMultipleCustomFields([$mac_address, $ram, $cpu])->create([
  $ram->db_column => 8,
  $cpu->db_column => '2.1',
  ]);
 
- $id_array = $assets->pluck('id')->toArray();
+ // seems like the fieldset is random, so bulkedit isn't working because assets don't have the "correct" fieldset
+ // look into more tomorrow
+ dd(Asset::find(1)->model->fieldset);
 
- // submits the ids and new values for each attribute
- $asset = Asset::find(1);
+ $id_array = $assets->pluck('id')->toArray();
 
- $this->assertEquals(8, $asset->{$ram->db_column});
  $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [
  'ids' => $id_array,
  $ram->db_column => 16,