From 38eb16dfea1059f6816c898d773cf343f929b457 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 16 Nov 2017 11:09:24 -0800
Subject: [PATCH 1/2] Fixed #4408 - requestable assets not working

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

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index 5f9ab1be81..9d6917787b 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -60,8 +60,7 @@
                                             @foreach ($assets as $asset)
 
                                             <tr>
-                                                <form action="{{route('account/request-item', ['itemType' => 'asset', 'itemId' => $asset->id])}}" method="POST" accept-charset="utf-8">
-                                                    {{ csrf_field() }}
+
                                                     <td>
                                                         @if ($asset->getImageUrl())
                                                             <a href="{{ $asset->getImageUrl() }}" data-toggle="lightbox" data-type="image">
@@ -96,13 +95,16 @@
 
                                                     <td>{{ $asset->expected_checkin }}</td>
                                                     <td>
+                                                        <form action="{{route('account/request-item', ['itemType' => 'asset', 'itemId' => $asset->id])}}" method="POST" accept-charset="utf-8">
+                                                        {{ csrf_field() }}
                                                         @if ($asset->isRequestedBy(Auth::user()))
                                                             {{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
                                                         @else
                                                             {{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}}
                                                         @endif
+                                                        </form>
                                                     </td>
-                                                </form>
+
                                             </tr>
                                             @endforeach
                                         </tbody>

From faab97193173674c636c9d4bdea3c0a725b68312 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 16 Nov 2017 11:09:42 -0800
Subject: [PATCH 2/2] Improved - removed 500 pixel width on 2FA dropdown

---
 resources/macros/macros.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index 90c6b0805e..23634f146c 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -478,7 +478,7 @@ Form::macro('two_factor_options', function ($name = "two_factor_enabled", $selec
 
     );
 
-    $select = '<select name="'.$name.'" class="'.$class.'" style="width: 500px">';
+    $select = '<select name="'.$name.'" class="'.$class.'">';
     foreach ($formats as $format => $label) {
         $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
     }