DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3' into v3-master

Browse source
This commit is contained in:
snipe 2016-06-21 12:22:49 -07:00
parent 3107b3679d 508e7acb54
commit 50e38cb740
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/UsersController.php
View file

@ -40,6 +40,8 @@ use Illuminate\Http\Request;
* *
* @version v1.0 * @version v1.0
*/ */
class UsersController extends Controller class UsersController extends Controller
{ {
@ -1132,6 +1134,8 @@ class UsersController extends Controller
*/ */
public function postLDAP() 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')); $location_id = e(Input::get('location_id'));

12
resources/views/hardware/view.blade.php
View file

@ -260,8 +260,18 @@
<div class="col-md-4"> <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=='')) @if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
<h4>{{ trans('admin/hardware/form.checkedout_to') }}</h4> <h4>{{ trans('admin/hardware/form.checkedout_to') }}</h4>