From 0f2f559d7ad9831c23e3bc9dd666f0668e958b98 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 23 Jul 2024 16:46:29 -0500
Subject: [PATCH 1/5] test works, helper still needs work. pushing to check
 something

---
 app/Helpers/Helper.php                    | 10 ++++++++++
 tests/Feature/Assets/Ui/EditAssetTest.php | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 tests/Feature/Assets/Ui/EditAssetTest.php

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 5b3290627..611ec8f11 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -914,11 +914,21 @@ class Helper
         $rules = $class::rules();
         foreach ($rules as $rule_name => $rule) {
             if ($rule_name == $field) {
+                if (is_array($rule)) {
+                    foreach ($rule as $rule_value) {
+                        if ($rule_value === 'required') {
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    }
+                } else {
                 if (strpos($rule, 'required') === false) {
                     return false;
                 } else {
                     return true;
                 }
+                }
             }
         }
     }
diff --git a/tests/Feature/Assets/Ui/EditAssetTest.php b/tests/Feature/Assets/Ui/EditAssetTest.php
new file mode 100644
index 000000000..9e58be268
--- /dev/null
+++ b/tests/Feature/Assets/Ui/EditAssetTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Feature\Assets\Ui;
+
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class EditAssetTest extends TestCase
+{
+    public function testPageCanBeAccessed(): void
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $response = $this->actingAs($user)->get(route('hardware.edit', $asset->id));
+
+        $response->assertStatus(200);
+    }
+}

From 0ae297634edb21043a10aef79dffe1943a05a48c Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 23 Jul 2024 16:59:58 -0500
Subject: [PATCH 2/5] ugh

---
 app/Helpers/Helper.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 611ec8f11..0e20d1629 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -915,12 +915,10 @@ class Helper
         foreach ($rules as $rule_name => $rule) {
             if ($rule_name == $field) {
                 if (is_array($rule)) {
-                    foreach ($rule as $rule_value) {
-                        if ($rule_value === 'required') {
-                            return true;
-                        } else {
-                            return false;
-                        }
+                    if (in_array('required', $rule)) {
+                        return true;
+                    } else {
+                        return false;
                     }
                 } else {
                 if (strpos($rule, 'required') === false) {

From e77e16b9aa9b314f3674daae286ab2b23677ce5d Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 23 Jul 2024 17:22:20 -0500
Subject: [PATCH 3/5] this works

---
 app/Helpers/Helper.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 0e20d1629..6f177fe85 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -916,19 +916,20 @@ class Helper
             if ($rule_name == $field) {
                 if (is_array($rule)) {
                     if (in_array('required', $rule)) {
-                        return true;
+                        $required = true;
                     } else {
-                        return false;
+                        $required = false;
                     }
                 } else {
-                if (strpos($rule, 'required') === false) {
-                    return false;
+                    if (strpos($rule_name, 'required') === false) {
+                        $required = false;
                 } else {
-                    return true;
+                        $required = true;
                 }
                 }
             }
         }
+        return $required;
     }
 
     /**

From 090a595c9925d10983aa092d6822f4fa1050bd73 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 23 Jul 2024 17:34:17 -0500
Subject: [PATCH 4/5] conflict

---
 app/Helpers/Helper.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 4540dcb16..85421027d 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -920,14 +920,16 @@ class Helper
                     } else {
                         $required = false;
                     }
-                if (strpos($rule, 'required') === false) {
-                    return false;
                 } else {
-                    if (strpos($rule_name, 'required') === false) {
-                        $required = false;
-                } else {
-                        $required = true;
-                }
+                    if (strpos($rule, 'required') === false) {
+                        return false;
+                    } else {
+                        if (strpos($rule_name, 'required') === false) {
+                            $required = false;
+                        } else {
+                            $required = true;
+                        }
+                    }
                 }
             }
         }

From b61ab423cab970dd81ecd6f04abef6ac97415101 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 23 Jul 2024 17:35:48 -0500
Subject: [PATCH 5/5] ok NOW it should be fine

---
 app/Helpers/Helper.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 85421027d..8bd3ab420 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -922,15 +922,11 @@ class Helper
                     }
                 } else {
                     if (strpos($rule, 'required') === false) {
-                        return false;
-                    } else {
-                        if (strpos($rule_name, 'required') === false) {
                             $required = false;
                         } else {
                             $required = true;
                         }
                     }
-                }
             }
         }
         return $required;