From e7e10c24bea9dbe5c24540eca694c2b846141657 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 1 Feb 2018 15:54:49 -0600 Subject: [PATCH 1/3] Add departments to usr export --- app/Http/Controllers/UsersController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 4a8ba70e7..27f18adf8 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -1068,7 +1068,7 @@ class UsersController extends Controller // Open output stream $handle = fopen('php://output', 'w'); - User::with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'groups', 'userloc', 'company','throttle')->orderBy('created_at', 'DESC')->chunk(500, function($users) use($handle) { + User::with('assets', 'accessories', 'consumables', 'department', 'licenses', 'manager', 'groups', 'userloc', 'company','throttle')->orderBy('created_at', 'DESC')->chunk(500, function($users) use($handle) { $headers=[ // strtolower to prevent Excel from trying to open it as a SYLK file strtolower(trans('general.id')), @@ -1080,6 +1080,7 @@ class UsersController extends Controller trans('admin/users/table.email'), trans('admin/users/table.manager'), trans('admin/users/table.location'), + trans('general.department'), trans('general.assets'), trans('general.licenses'), trans('general.accessories'), @@ -1110,6 +1111,7 @@ class UsersController extends Controller $user->email, ($user->manager) ? $user->manager->present()->fullName() : '', ($user->userloc) ? $user->userloc->name : '', + ($user->department) ? $user->department->name : '', $user->assets->count(), $user->licenses->count(), $user->accessories->count(), From 8b2045523de0ae12a552b3f06925f3fd8f325eec Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 1 Feb 2018 15:55:33 -0600 Subject: [PATCH 2/3] Bumped hash --- config/version.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/version.php b/config/version.php index b4b8710a9..c4b59bc51 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.1.11-pre', - 'full_app_version' => 'v4.1.11-pre - build 3299-g3acf5f7', - 'build_version' => '3299', + 'full_app_version' => 'v4.1.11-pre - build 3307-gf06852f', + 'build_version' => '3307', 'prerelease_version' => '', - 'hash_version' => 'g3acf5f7', - 'full_hash' => 'v4.1.11-pre-47-g3acf5f7', + 'hash_version' => 'gf06852f', + 'full_hash' => 'v4.1.11-pre-55-gf06852f', 'branch' => 'develop', ); From d2587337e4cc4affb6bc38b2f1df3116dde01fcb Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 1 Feb 2018 16:31:32 -0600 Subject: [PATCH 3/3] Fixed #4952 - ignore show_archived setting when drilling down into specific ID --- app/Http/Controllers/Api/AssetsController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 707668d6d..ef89f948a 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -199,12 +199,18 @@ class AssetsController extends Controller break; default: - if ($settings->show_archived_in_list!='1') { + if ((!$request->has('status_id')) && ($settings->show_archived_in_list!='1')) { // terrible workaround for complex-query Laravel bug in fulltext $assets->join('status_labels AS status_alias',function ($join) { $join->on('status_alias.id', "=", "assets.status_id") ->where('status_alias.archived', '=', 0); }); + + // If there is a status ID, don't take show_archived_in_list into consideration + } else { + $assets->join('status_labels AS status_alias',function ($join) { + $join->on('status_alias.id', "=", "assets.status_id"); + }); } }