From e9227f77b638dc9342b5c492ef5a1a192999dc08 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 21 Jun 2016 12:20:22 -0700
Subject: [PATCH 1/2] Fixes  #2163 - put model image in view if no asset image

---
 resources/views/hardware/view.blade.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 97851f66dc..5034722a1a 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -260,8 +260,18 @@
 
           <div class="col-md-4">
 
+              @if ($asset->image)
+                  <img src="{{ Config::get('app.url') }}/uploads/assets/{{{ $asset->image }}}" class="assetimg">
+              @else
+                  @if ($asset->model->image!='')
+                      <img src="{{ Config::get('app.url') }}/uploads/models/{{{ $asset->model->image }}}" class="assetimg">
+                  @endif
+              @endif
+
+              @if  (App\Models\Setting::getSettings()->qr_code=='1')
+                 <img src="{{ config('get.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;">
+              @endif
 
-              <img src="{{ config('get.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;">
 
             @if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
                 <h4>{{ trans('admin/hardware/form.checkedout_to') }}</h4>

From 508e7acb542b2d7cfcfa756c050688e98ff3bfae Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 21 Jun 2016 12:22:10 -0700
Subject: [PATCH 2/2] Bump up memory for LDAP import of large number of users

---
 app/Http/Controllers/UsersController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 862ea632b0..40a9eaab90 100755
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -40,6 +40,8 @@ use Illuminate\Http\Request;
  *
  * @version    v1.0
  */
+
+
 class UsersController extends Controller
 {
 
@@ -1132,6 +1134,8 @@ class UsersController extends Controller
     */
     public function postLDAP()
     {
+        ini_set('max_execution_time', 600); //600 seconds = 10 minutes
+        ini_set('memory_limit', '500M');
 
         $location_id = e(Input::get('location_id'));