DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Feature Request] Fixes #2030 - allow asset name change on checkin

Browse source
This commit is contained in:
snipe 2016-05-12 12:34:44 -07:00
parent a96947efa9
commit 6d91774943
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/AssetsController.php
View file

@ -524,6 +524,7 @@ class AssetsController extends Controller
$asset->last_checkout = null; $asset->last_checkout = null;
$asset->assigned_to = null; $asset->assigned_to = null;
$asset->accepted = null; $asset->accepted = null;
$asset->name = e(Input::get('name'));
if (Input::has('status_id')) { if (Input::has('status_id')) {

11
resources/views/hardware/checkin.blade.php
View file

@ -29,6 +29,7 @@
</div><!-- /.box-header --> </div><!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="col-md-12">
@if ($backto=='user') @if ($backto=='user')
<form class="form-horizontal" method="post" action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" autocomplete="off"> <form class="form-horizontal" method="post" action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" autocomplete="off">
@ -50,17 +51,17 @@
</div> </div>
@endif @endif
@if ($asset->name)
<!-- Asset name --> <!-- Asset Name -->
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('name', trans('admin/hardware/form.name')) }} {{ Form::label('name', trans('admin/hardware/form.name')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<p class="form-control-static">{{ $asset->name }}</p> <input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>
@endif
<!-- Status --> <!-- Status -->
<div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
@ -101,7 +102,7 @@
</div> </div>
</div>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>