From 0a6626891eb0993545d840e9408a222ed21e3dfc Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 24 May 2022 13:36:13 -0500
Subject: [PATCH 1/6] Add links to requestable Models' name

---
 resources/views/account/requestable-assets.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index b17fd98e8..55db888cc 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -109,8 +109,7 @@
 
                                                 </td>
 
-
-                                                <td>{{$requestableModel->name}}</td>
+                                            <td><a href='{{ url("/models/{$requestableModel->id}") }}' > {{ $requestableModel->name }} </a></td>
                                                 <td>{{$requestableModel->assets->where('requestable', '1')->count()}}</td>
 
                                                 <td>

From e0b64a487940f2c2ccbb7d0d0ac073a8cf1ecd93 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 24 May 2022 14:00:23 -0500
Subject: [PATCH 2/6] Fixes constraint violation when ordering some columns

---
 app/Models/Asset.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 3466cbffe..0bbb06aa1 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -1187,7 +1187,9 @@ class Asset extends Depreciable
 
     public function scopeRequestableAssets($query)
     {
-        return Company::scopeCompanyables($query->where('requestable', '=', 1))
+        $table = $query->getModel()->getTable();
+
+        return Company::scopeCompanyables($query->where($table.'.requestable', '=', 1))
         ->whereHas('assetstatus', function ($query) {
             $query->where(function ($query) {
                 $query->where('deployable', '=', 1)

From 6d1de73cad3b58e645430537f04b8d7fc615a01c Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 24 May 2022 14:06:05 -0500
Subject: [PATCH 3/6] Fixes some html structure in the requested assets view

---
 resources/views/hardware/requested.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index a84e347e3..5a38d89ce 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -51,8 +51,7 @@
                         <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
                         <th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
                         <th class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
-                        <th class="col-md-1"></th>
-                        <th class="col-md-1"></th>
+                        <th class="col-md-1">{{ trans('general.checkin').'/'.trans('general.checkout') }}</th>
                     </tr>
                 </thead>
                 <tbody>

From aa841a4674f5bfc9901b1d143a5841d539a85c90 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 24 May 2022 14:40:32 -0500
Subject: [PATCH 4/6] Check permission before show links or not in requestable
 asset models view

---
 resources/views/account/requestable-assets.blade.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index 55db888cc..3cc6a8cff 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -109,7 +109,14 @@
 
                                                 </td>
 
-                                            <td><a href='{{ url("/models/{$requestableModel->id}") }}' > {{ $requestableModel->name }} </a></td>
+                                                <td>
+                                                    @if (Gate::allows('superadmin'))
+                                                        <a href='{{ url("/models/{$requestableModel->id}") }}' > {{ $requestableModel->name }} </a></td>
+                                                    @else
+                                                        {{ $requestableModel->name }}
+                                                    @endif
+                                                </td>
+
                                                 <td>{{$requestableModel->assets->where('requestable', '1')->count()}}</td>
 
                                                 <td>

From 1e3c0d597e8996ff55f34660e7b6a3af5297cb85 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 24 May 2022 15:53:26 -0500
Subject: [PATCH 5/6] Use @can view directive instead of @if superadmin

---
 resources/views/account/requestable-assets.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index 3cc6a8cff..a8c378d57 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -110,11 +110,11 @@
                                                 </td>
 
                                                 <td>
-                                                    @if (Gate::allows('superadmin'))
+                                                    @can('view', \App\Models\AssetModel::class)
                                                         <a href='{{ url("/models/{$requestableModel->id}") }}' > {{ $requestableModel->name }} </a></td>
                                                     @else
                                                         {{ $requestableModel->name }}
-                                                    @endif
+                                                    @endcan
                                                 </td>
 
                                                 <td>{{$requestableModel->assets->where('requestable', '1')->count()}}</td>

From a4cf601c9825c745e003e12d1682de7d12539baf Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 24 May 2022 16:27:55 -0500
Subject: [PATCH 6/6] Remove extra tag and other stylistic changes

---
 resources/views/account/requestable-assets.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index a8c378d57..18b923289 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -111,7 +111,7 @@
 
                                                 <td>
                                                     @can('view', \App\Models\AssetModel::class)
-                                                        <a href='{{ url("/models/{$requestableModel->id}") }}' > {{ $requestableModel->name }} </a></td>
+                                                        <a href='{{ url("/models/{$requestableModel->id}") }}'>{{ $requestableModel->name }}</a>
                                                     @else
                                                         {{ $requestableModel->name }}
                                                     @endcan