DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Associate serials with multiple asset creation

Browse source
This commit is contained in:
snipe 2018-10-05 05:30:13 -07:00
parent 476b58632b
commit ecb8204c3c
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Assets/AssetsController.php
View file

@ -117,12 +117,17 @@ class AssetsController extends Controller
$asset_tags = $request->input('asset_tags'); $asset_tags = $request->input('asset_tags');
$success = false; $success = false;
$serials = $request->input('serials');
for ($a = 1; $a <= count($asset_tags); $a++) { for ($a = 1; $a <= count($asset_tags); $a++) {
$asset = new Asset(); $asset = new Asset();
$asset->model()->associate(AssetModel::find($request->input('model_id'))); $asset->model()->associate(AssetModel::find($request->input('model_id')));
$asset->name = $request->input('name'); $asset->name = $request->input('name');
$asset->serial = $request->input('serial'); // Check for a corresponding serial
if (($serials) && (array_key_exists($a, $serials))) {
$asset->serial = $serials[$a];
}
$asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); $asset->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$asset->model_id = $request->input('model_id'); $asset->model_id = $request->input('model_id');
$asset->order_number = $request->input('order_number'); $asset->order_number = $request->input('order_number');

4
resources/views/hardware/edit.blade.php
View file

@ -34,9 +34,9 @@
<button class="add_field_button btn btn-default btn-sm"><i class="fa fa-plus"></i></button> <button class="add_field_button btn btn-default btn-sm"><i class="fa fa-plus"></i></button>
</div> </div>
@endif @endif
{!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('asset_tags', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
@include ('partials.forms.edit.serial', ['translated_serial' => trans('admin/hardware/form.serial')]) @include ('partials.forms.edit.serial', ['fieldname'=> 'serials[1]', 'translated_serial' => trans('admin/hardware/form.serial')])
<div class="input_fields_wrap"> <div class="input_fields_wrap">
</div> </div>

4
resources/views/partials/forms/edit/serial.blade.php
View file

@ -1,8 +1,8 @@
<!-- Serial --> <!-- Serial -->
<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
<label for="serial" class="col-md-3 control-label">{{ trans('admin/hardware/form.serial') }} </label> <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ trans('admin/hardware/form.serial') }} </label>
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}">
<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $item->serial) }}" /> <input class="form-control" type="text" name="{{ $fieldname }}" id="serial" value="{{ Input::old('serial', $item->serial) }}" />
{!! $errors->first('serial', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('serial', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>