ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into Modal_fix_p2

Browse Source
This commit is contained in:
Godfrey M
2024-09-25 11:10:24 -07:00
parent 0bc98e971f cb6e5042d9
commit 926a319552
940 changed files with 7526 additions and 4279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/users/bulk-edit.blade.php
+11 -2
View File
@@ -90,15 +90,24 @@
</div>
<!-- language -->
<!-- Language -->
<div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label>
<div class="col-md-8">
{!! Form::locales('locale', old('locale', $user->locale), 'select2') !!}
{!! Form::locales('locale', old('locale', ''), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>
<div class="form-group">
<div class=" col-md-9 col-md-offset-3">
<label class="form-control">
{{ Form::checkbox('null_locale', '1', false) }}
{{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('general.language'), 'user_count' => count($users)]) }}
</label>
</div>
</div>
<!-- City -->
<div class="form-group{{ $errors->has('city') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label>
resources/views/users/view.blade.php
+7 -1
View File
@@ -330,7 +330,13 @@
{{ trans('general.company') }}
</div>
<div class="col-md-9">
{{ $user->company->name }}
@can('view', 'App\Models\Company')
<a href="{{ route('companies.show', $user->company->id) }}">
{{ $user->company->name }}
</a>
@else
{{ $user->company->name }}
@endcan
</div>
</div>