mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-28 23:19:42 -08:00
Merge branch 'develop'
This commit is contained in:
snipe
commit
8dceacc2b4
|
|
@ -97,7 +97,7 @@ LOGIN_LOCKOUT_DURATION=60
|
|||
# --------------------------------------------
|
||||
# OPTIONAL: MISC
|
||||
# --------------------------------------------
|
||||
APP_LOG=daily
|
||||
APP_LOG=single
|
||||
APP_LOG_MAX_FILES=10
|
||||
APP_LOCKED=false
|
||||
FILESYSTEM_DISK=local
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@
|
|||
</div> <!--/row-->
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="box box-default" style="min-height: 400px;">
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ trans('general.assets') }} by Status</h3>
|
||||
<div class="box-tools pull-right">
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<!-- /.box-header -->
|
||||
<div class="box-body">
|
||||
<div class="box-body" style="min-height: 400px;">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="chart-responsive">
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@
|
|||
@endcan
|
||||
|
||||
@can('backend.interact')
|
||||
<li>
|
||||
<li class="treeview">
|
||||
<a href="#">
|
||||
<i class="fa fa-gear"></i>
|
||||
<span>{{ trans('general.settings') }}</span>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<select class="js-data-ajax select2" data-endpoint="hardware" name="{{ $fieldname }}" style="width: 100%" id="assigned_asset_select"{{ (isset($multiple)) ? ' multiple="multiple"' : '' }}>
|
||||
@if ($asset_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
|
||||
<option value="{{ $asset_id }}" selected="selected">
|
||||
{{ \App\Models\Asset::find($asset_id)->present()->fullName }}
|
||||
{{ (\App\Models\Asset::find($asset_id)) ? \App\Models\Asset::find($asset_id)->present()->fullName : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_asset') }}</option>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id">
|
||||
@if ($category_id = Input::old($fieldname, $item->{$fieldname}))
|
||||
<option value="{{ $category_id }}" selected="selected">
|
||||
{{ \App\Models\Category::find($category_id)->name }}
|
||||
{{ (\App\Models\Category::find($category_id)) ? \App\Models\Category::find($category_id)->name : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_category') }}</option>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<select class="js-data-ajax" data-endpoint="companies" name="{{ $fieldname }}" style="width: 100%" id="company_select">
|
||||
@if ($company_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
|
||||
<option value="{{ $company_id }}" selected="selected">
|
||||
{{ \App\Models\Company::find($company_id)->name }}
|
||||
{{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_company') }}</option>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<select class="js-data-ajax" data-endpoint="departments" name="{{ $fieldname }}" style="width: 100%" id="department_select">
|
||||
@if ($department_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
|
||||
<option value="{{ $department_id }}" selected="selected">
|
||||
{{ \App\Models\Department::find($department_id)->name }}
|
||||
{{ (\App\Models\Department::find($department_id)) ? \App\Models\Department::find($department_id)->name : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_department') }}</option>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<select class="js-data-ajax" data-endpoint="manufacturers" name="{{ $fieldname }}" style="width: 100%" id="category_select_id">
|
||||
@if ($manufacturer_id = Input::old($fieldname, $item->{$fieldname}))
|
||||
<option value="{{ $manufacturer_id }}" selected="selected">
|
||||
{{ \App\Models\Manufacturer::find($manufacturer_id)->name }}
|
||||
{{ (\App\Models\Manufacturer::find($manufacturer_id)) ? \App\Models\Manufacturer::find($manufacturer_id)->name : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_manufacturer') }}</option>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<select class="js-data-ajax" data-endpoint="models" name="{{ $fieldname }}" style="width: 100%" id="model_select_id">
|
||||
@if ($model_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
|
||||
<option value="{{ $model_id }}" selected="selected">
|
||||
{{ \App\Models\AssetModel::find($model_id)->name }}
|
||||
{{ (\App\Models\AssetModel::find($model_id)) ? \App\Models\AssetModel::find($model_id)->name : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_model') }}</option>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<select class="js-data-ajax" data-endpoint="suppliers" name="{{ $fieldname }}" style="width: 100%" id="supplier_select">
|
||||
@if ($supplier_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
|
||||
<option value="{{ $supplier_id }}" selected="selected">
|
||||
{{ \App\Models\Supplier::find($supplier_id)->name }}
|
||||
{{ (\App\Models\Supplier::find($supplier_id)) ? \App\Models\Supplier::find($supplier_id)->name : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_supplier') }}</option>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<select class="js-data-ajax" data-endpoint="users" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select">
|
||||
@if ($user_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
|
||||
<option value="{{ $user_id }}" selected="selected">
|
||||
{{ \App\Models\User::find($user_id)->present()->fullName }}
|
||||
{{ (\App\Models\User::find($user_id)) ? \App\Models\User::find($user_id)->present()->fullName : '' }}
|
||||
</option>
|
||||
@else
|
||||
<option value="">{{ trans('general.select_user') }}</option>
|
||||
|
|
|
|||
Loading…
Reference in a new issue