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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-06-23 19:12:13 -07:00
parent 9fc4565bc1 86d2c2b153
commit a75fc8af7e
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/UsersController.php
View file

@ -188,7 +188,7 @@ class UsersController extends Controller
$users = $users->OrderDepartment($order); $users = $users->OrderDepartment($order);
break; break;
case 'created_by': case 'created_by':
$users = $users->CreatedBy($order); $users = $users->OrderByCreatedBy($order);
break; break;
case 'company': case 'company':
$users = $users->OrderCompany($order); $users = $users->OrderCompany($order);

2
app/Models/User.php
View file

@ -705,7 +705,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
* *
* @return \Illuminate\Database\Query\Builder Modified query builder * @return \Illuminate\Database\Query\Builder Modified query builder
*/ */
public function scopeCreatedBy($query, $order) public function scopeOrderByCreatedBy($query, $order)
{ {
// Left join here, or it will only return results with parents // Left join here, or it will only return results with parents
return $query->leftJoin('users as admin_user', 'users.created_by', '=', 'admin_user.id') return $query->leftJoin('users as admin_user', 'users.created_by', '=', 'admin_user.id')

2
app/Presenters/UserPresenter.php
View file

@ -289,7 +289,7 @@ class UserPresenter extends Presenter
'field' => 'created_by', 'field' => 'created_by',
'searchable' => false, 'searchable' => false,
'sortable' => true, 'sortable' => true,
'title' => trans('general.admin'), 'title' => trans('general.created_by'),
'visible' => false, 'visible' => false,
'formatter' => 'usersLinkObjFormatter', 'formatter' => 'usersLinkObjFormatter',
], ],

3
resources/lang/en/general.php
View file

@ -65,7 +65,8 @@ return [
'create' => 'Create New', 'create' => 'Create New',
'created' => 'Item Created', 'created' => 'Item Created',
'created_asset' => 'created asset', 'created_asset' => 'created asset',
'created_at' => 'Created at', 'created_at' => 'Created At',
'created_by' => 'Created By',
'record_created' => 'Record Created', 'record_created' => 'Record Created',
'updated_at' => 'Updated at', 'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated 'currency' => '$', // this is deprecated

2
resources/views/users/view.blade.php
View file

@ -465,7 +465,7 @@
{{ \App\Helpers\Helper::getFormattedDateObject($user->created_at, 'datetime')['formatted']}} {{ \App\Helpers\Helper::getFormattedDateObject($user->created_at, 'datetime')['formatted']}}
@if ($user->createdBy) @if ($user->createdBy)
by -
@if ($user->createdBy->deleted_at=='') @if ($user->createdBy->deleted_at=='')
<a href="{{ route('users.show', ['user' => $user->created_by]) }}">{{ $user->createdBy->present()->fullName }}</a> <a href="{{ route('users.show', ['user' => $user->created_by]) }}">{{ $user->createdBy->present()->fullName }}</a>
@else @else