mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 14:05:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2026-01-07 13:36:31 +00:00
parent 5ddb0b4a55 14ff325608
commit f149f0d994
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Presenters/ActionlogPresenter.php
View File

@ -14,7 +14,7 @@ class ActionlogPresenter extends Presenter
return $user->present()->nameUrl(); return $user->present()->nameUrl();
} }
// The user was deleted // The user was deleted
return '<del>'.$user->getFullNameAttribute().'</del> (deleted)'; return '<del>'.$user->display_name.'</del> (deleted)';
} }
return ''; return '';

2
app/Presenters/UserPresenter.php
View File

@ -524,7 +524,7 @@ class UserPresenter extends Presenter
*/ */
public function nameUrl() public function nameUrl()
{ {
return (string) link_to_route('users.show', $this->getFullNameAttribute(), $this->id); return (string) link_to_route('users.show', $this->display_name, $this->id);
} }
/** /**

64
resources/views/hardware/edit.blade.php
View File

@ -24,7 +24,7 @@
<!-- Asset Tag --> <!-- Asset Tag -->
<div class="form-group {{ ($errors->has('asset_tag') || $errors->has('asset_tags.1')) ? ' has-error' : '' }}"> <div class="form-group {{ ($errors->has('asset_tag') || $errors->has('asset_tags.1')) ? ' has-error' : '' }}">
<label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label> <label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
@ -134,7 +134,7 @@
</div> </div>
<div class="col-md-12 col-sm-12"> <div class="col-md-12 col-sm-12">
<fieldset name="optional-details"> <fieldset name="optional-details">
@ -166,38 +166,36 @@
</div> <!-- end optional details --> </div> <!-- end optional details -->
</fieldset> </fieldset>
</div><!-- end col-md-12 col-sm-12-->
<div class="col-md-12 col-sm-12">
<fieldset name="order-info">
<x-form-legend>
<a id="order_info">
<x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
{{ trans('admin/hardware/form.order_details') }}
</a>
</x-form-legend>
<div id='order_details' class="col-md-12" style="display:none">
@include ('partials.forms.edit.order_number')
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.eol_date'),'fieldname' => 'asset_eol_date'])
@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
@php
$currency_type = null;
if ($item->id && $item->location) {
$currency_type = $item->location->currency;
}
@endphp
@include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
</div> <!-- end order details -->
</fieldset>
</div><!-- end col-md-12 col-sm-12-->
</div><!-- end col-md-12 col-sm-12--> </div><!-- end col-md-12 col-sm-12-->
<div class="col-md-12 col-sm-12">
<fieldset name="order-info">
<x-form-legend>
<a id="order_info">
<x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
{{ trans('admin/hardware/form.order_details') }}
</a>
</x-form-legend>
<div id='order_details' class="col-md-12" style="display:none">
@include ('partials.forms.edit.order_number')
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.eol_date'),'fieldname' => 'asset_eol_date'])
@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
@php
$currency_type = null;
if ($item->id && $item->location) {
$currency_type = $item->location->currency;
}
@endphp
@include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
</div> <!-- end order details -->
</fieldset>
</div><!-- end col-md-12 col-sm-12--> </div><!-- end col-md-12 col-sm-12-->
@stop @stop