From 0c9e41e1fae40431f5034a068512fce74873c1a1 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 19:01:47 -0800 Subject: [PATCH 01/30] Updated versioning script to handle githooks better --- app/Console/Commands/Version.php | 140 ++++++++++++++++++++++++++++ app/Console/Commands/Versioning.php | 91 ------------------ app/Console/Kernel.php | 2 +- config/version.php | 14 ++- 4 files changed, 150 insertions(+), 97 deletions(-) create mode 100644 app/Console/Commands/Version.php delete mode 100644 app/Console/Commands/Versioning.php diff --git a/app/Console/Commands/Version.php b/app/Console/Commands/Version.php new file mode 100644 index 0000000000..c11ff7865c --- /dev/null +++ b/app/Console/Commands/Version.php @@ -0,0 +1,140 @@ +option('branch'); + $use_type = $this->option('type'); + $git_branch = trim(shell_exec('git rev-parse --abbrev-ref HEAD')); + $build_version = trim(shell_exec('git rev-list --count '.$use_branch)); + $versionFile = 'config/version.php'; + $full_hash_version = str_replace("\n", '', shell_exec('git describe master --tags')); + + $version = explode('-', $full_hash_version); + $app_version = $current_app_version = $version[0]; + $hash_version = $version[2]; + $prerelease_version = ''; + + $this->line('Branch is: '.$use_branch); + $this->line('Type is: '.$use_type); + $this->line('Current version is: '.$full_hash_version); + + if (count($version)==3) { + $this->line('This does not look like an alpha/beta release.'); + } else { + print_r($version); + if (array_key_exists('3',$version)) { + $this->line('The current version looks like a beta release.'); + $prerelease_version = $version[1]; + $hash_version = $version[3]; + } + } + + + $app_version_raw = explode('.', $app_version); + + $maj = str_replace('v', '', $app_version_raw[0]); + $min = $app_version_raw[1]; + $patch = ''; + + + + // This is a major release that might not have a third .0 + if (array_key_exists(2, $app_version_raw)) { + $patch = $app_version_raw[2]; + } + + if ($use_type=='major') { + $app_version = "v".($maj + 1).".$min.$patch"; + } elseif ($use_type=='minor') { + $app_version = "v"."$maj.".($min + 1).".$patch"; + } elseif ($use_type=='pre') { + $pre_raw = str_replace('beta','', $prerelease_version); + $pre_raw = str_replace('alpha','', $pre_raw); + $pre_raw = str_ireplace('rc','', $pre_raw); + $pre_raw = $pre_raw++; + $this->line('Setting the pre-release to '. $prerelease_version.'-'.$pre_raw); + $app_version = "v"."$maj.".($min + 1).".$patch"; + } elseif ($use_type=='patch') { + $app_version = "v" . "$maj.$min." . ($patch + 1); + // If nothing is passed, leave the version as it is, just increment the build + } else { + $app_version = "v" . "$maj.$min." . $patch; + } + + // Determine if this tag already exists, or if this prior to a release + $this->line('Running: git rev-parse master '.$current_app_version); + $pre_release = trim(shell_exec('git rev-parse '.$use_branch.' '.$current_app_version.' 2>&1 1> /dev/null')); + + echo 'Output:'.$pre_release; + + + if ($use_branch=='develop') { + $app_version = $app_version.'-pre'; + } + + $full_app_version = $app_version.' - build '.$build_version.'-'.$hash_version; + + + $array = var_export( + array( + 'app_version' => $app_version, + 'full_app_version' => $full_app_version, + 'build_version' => $build_version, + 'prerelease_version' => $prerelease_version, + 'hash_version' => $hash_version, + 'full_hash' => $full_hash_version, + 'branch' => $git_branch, + 'next_version' => ''), + true + ); + + + + // Construct our file content + $content = <<info('Setting NEW version: '. $full_app_version.' ('.$git_branch.')'); + } + +} diff --git a/app/Console/Commands/Versioning.php b/app/Console/Commands/Versioning.php deleted file mode 100644 index c540ff0a24..0000000000 --- a/app/Console/Commands/Versioning.php +++ /dev/null @@ -1,91 +0,0 @@ - $version[0], - 'build_version' => $version[1], - 'hash_version' => $version[2], - 'full_hash' => $hash_version), - true - ); - - - // Construct our file content - $content = <<line('Setting version: '. config('version.app_version').' build '.config('version.build_version').' ('.config('version.hash_version').')'); - } - - /** - * Get the console command arguments. - * - * @return array - */ - protected function getArguments() - { - return array( - ); - } - - /** - * Get the console command options. - * - * @return array - */ - protected function getOptions() - { - return array( - ); - } -} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index cc104d8e4b..9a49718df3 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -19,7 +19,7 @@ class Kernel extends ConsoleKernel Commands\SendInventoryAlerts::class, Commands\SendExpectedCheckinAlerts::class, Commands\ObjectImportCommand::class, - Commands\Versioning::class, + Commands\Version::class, Commands\SystemBackup::class, Commands\DisableLDAP::class, Commands\Purge::class, diff --git a/config/version.php b/config/version.php index f3cac09037..aa7a47e894 100644 --- a/config/version.php +++ b/config/version.php @@ -1,7 +1,11 @@ 'v4.1.5', - 'build_version' => '187', - 'hash_version' => 'gc0293a7', - 'full_hash' => 'v4.1.5-beta2-187-gc0293a7', -); + 'app_version' => 'v4.1.6-pre', + 'full_app_version' => 'v4.1.6-pre - build 2736-g1d6320a', + 'build_version' => '2736', + 'prerelease_version' => '', + 'hash_version' => 'g1d6320a', + 'full_hash' => 'v4.1.5-2-g1d6320a', + 'branch' => 'develop', + 'next_version' => '', +); \ No newline at end of file From f4aa812d9625b64f118db1c85dcca3d94a2b5a3d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 19:02:15 -0800 Subject: [PATCH 02/30] Changed twitter handle to @snipeitapp --- resources/views/layouts/default.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index e52a2d8f95..e642167f2c 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -727,12 +727,12 @@
Snipe-IT is an open source - project, made with by @snipeyhead under the AGPL3 license. + project, made with by @snipeitapp under the AGPL3 license.
From a922c1a298cdb1477077941aceb9186d07afb060 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 19:38:29 -0800 Subject: [PATCH 03/30] Auto-bumped hash/version --- config/version.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index aa7a47e894..bd189548ff 100644 --- a/config/version.php +++ b/config/version.php @@ -1,11 +1,10 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2736-g1d6320a', - 'build_version' => '2736', + 'full_app_version' => 'v4.1.6-pre - build 2738-g1d6320a', + 'build_version' => '2738', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', 'branch' => 'develop', - 'next_version' => '', ); \ No newline at end of file From e5129a8b985b4d17162f41df1374b13986ad8743 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 19:39:33 -0800 Subject: [PATCH 04/30] Removed next_version --- app/Console/Commands/Version.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/Console/Commands/Version.php b/app/Console/Commands/Version.php index c11ff7865c..8d71e23e79 100644 --- a/app/Console/Commands/Version.php +++ b/app/Console/Commands/Version.php @@ -99,11 +99,8 @@ class Version extends Command // Determine if this tag already exists, or if this prior to a release $this->line('Running: git rev-parse master '.$current_app_version); - $pre_release = trim(shell_exec('git rev-parse '.$use_branch.' '.$current_app_version.' 2>&1 1> /dev/null')); + // $pre_release = trim(shell_exec('git rev-parse '.$use_branch.' '.$current_app_version.' 2>&1 1> /dev/null')); - echo 'Output:'.$pre_release; - - if ($use_branch=='develop') { $app_version = $app_version.'-pre'; } @@ -119,8 +116,7 @@ class Version extends Command 'prerelease_version' => $prerelease_version, 'hash_version' => $hash_version, 'full_hash' => $full_hash_version, - 'branch' => $git_branch, - 'next_version' => ''), + 'branch' => $git_branch), true ); From 7ce63e653b32a8f4683b0bfdffcb70a17a692b8d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 19:39:53 -0800 Subject: [PATCH 05/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index bd189548ff..119af2a579 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2738-g1d6320a', - 'build_version' => '2738', + 'full_app_version' => 'v4.1.6-pre - build 2740-g1d6320a', + 'build_version' => '2740', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 43c1e893c0b665a682208f823c588120dd9da622 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:13:51 -0800 Subject: [PATCH 06/30] Fixed #4494 - use audit settings for asset audit pre-populaton --- app/Http/Controllers/AssetsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index 873446d420..4562ef39d8 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -1238,8 +1238,9 @@ class AssetsController extends Controller public function audit($id) { + $settings = Setting::getSettings(); $this->authorize('audit', Asset::class); - $dt = Carbon::now()->addMonths(12)->toDateString(); + $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); $asset = Asset::findOrFail($id); return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list'); } From 0adebd1ec8095cdc931f0e58f2d8966f93849e00 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:33:30 -0800 Subject: [PATCH 07/30] Add sorting and additional category types to dashboard categories BREAKING CHANGE: Category type now reports as `category_type`, instead of `type` --- app/Http/Controllers/Api/CategoriesController.php | 2 +- app/Http/Transformers/CategoriesTransformer.php | 2 +- app/Presenters/CategoryPresenter.php | 2 +- resources/views/dashboard.blade.php | 10 +++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index e86eea78fa..006eea0ff6 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -21,7 +21,7 @@ class CategoriesController extends Controller public function index(Request $request) { $this->authorize('view', Category::class); - $allowed_columns = ['id', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email', 'assets_count', 'accessories_count', 'consumables_count', 'components_count', 'image']; + $allowed_columns = ['id', 'name','category_type', 'category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email', 'assets_count', 'accessories_count', 'consumables_count', 'components_count', 'image']; $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email','image']) ->withCount('assets', 'accessories', 'consumables', 'components'); diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php index 0c77917d42..77bf07aa29 100644 --- a/app/Http/Transformers/CategoriesTransformer.php +++ b/app/Http/Transformers/CategoriesTransformer.php @@ -26,7 +26,7 @@ class CategoriesTransformer 'id' => (int) $category->id, 'name' => e($category->name), 'image' => ($category->image) ? app('categories_upload_url').e($category->image) : null, - 'type' => e($category->category_type), + 'category_type' => e($category->category_type), 'eula' => ($category->getEula()) ? true : false, 'checkin_email' => ($category->checkin_email =='1') ? true : false, 'require_acceptance' => ($category->require_acceptance =='1') ? true : false, diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php index db864f43e7..0df0bf13c6 100644 --- a/app/Presenters/CategoryPresenter.php +++ b/app/Presenters/CategoryPresenter.php @@ -40,7 +40,7 @@ class CategoryPresenter extends Presenter "visible" => true, "formatter" => 'imageFormatter', ],[ - "field" => "type", + "field" => "category_type", "searchable" => true, "sortable" => true, "title" => trans('general.type'), diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 37c3c49b95..2c6da09c5e 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -219,11 +219,15 @@ id="table" data-height="440" - data-url="{{ route('api.categories.index') }}"> + data-url="{{ route('api.categories.index', ['sort' => 'assets_count', 'order' => 'asc']) }}"> - {{ trans('general.name') }} - + {{ trans('general.name') }} + {{ trans('general.type') }} + + + + From 8711bc0dbd917f239910ee5f24e95c65400d9255 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:55:57 -0800 Subject: [PATCH 08/30] Added comments for toggle checkout-to JS --- resources/assets/js/snipeit.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js index 7119bafc79..ef0e1ba616 100755 --- a/resources/assets/js/snipeit.js +++ b/resources/assets/js/snipeit.js @@ -255,6 +255,8 @@ $(document).ready(function () { return datalist.text; } + // This handles the radio button selectors for the checkout-to-foo options + // on asset checkout and also on asset edit $(function() { $('input[name=checkout_to_type]').on("change",function () { var assignto_type = $('input[name=checkout_to_type]:checked').val(); From ab9c84a6b6ccf83dba77522027dd57b82325b354 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:33 -0800 Subject: [PATCH 09/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 119af2a579..0f1b7e64cd 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2740-g1d6320a', - 'build_version' => '2740', + 'full_app_version' => 'v4.1.6-pre - build 2744-g1d6320a', + 'build_version' => '2744', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From efecdfaea0547af8ac67dd52b9f945913f0fe07c Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:35 -0800 Subject: [PATCH 10/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 0f1b7e64cd..0040450523 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2744-g1d6320a', - 'build_version' => '2744', + 'full_app_version' => 'v4.1.6-pre - build 2745-g1d6320a', + 'build_version' => '2745', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 148751d92708c143245eb139194fec11897564a7 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:37 -0800 Subject: [PATCH 11/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 0040450523..1989da1a93 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2745-g1d6320a', - 'build_version' => '2745', + 'full_app_version' => 'v4.1.6-pre - build 2746-g1d6320a', + 'build_version' => '2746', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 1e2ebdb69cb5134204181cc1acb2156d39ce4bc5 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:39 -0800 Subject: [PATCH 12/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 1989da1a93..ce792c1192 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2746-g1d6320a', - 'build_version' => '2746', + 'full_app_version' => 'v4.1.6-pre - build 2747-g1d6320a', + 'build_version' => '2747', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 671e514785ff5b6f003ec96172c20e599cffbc12 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:41 -0800 Subject: [PATCH 13/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index ce792c1192..719ba56b7e 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2747-g1d6320a', - 'build_version' => '2747', + 'full_app_version' => 'v4.1.6-pre - build 2748-g1d6320a', + 'build_version' => '2748', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 932b589a140e9cae4eb9bfd58a9f6004235c384e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:43 -0800 Subject: [PATCH 14/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 719ba56b7e..1f8631020b 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2748-g1d6320a', - 'build_version' => '2748', + 'full_app_version' => 'v4.1.6-pre - build 2749-g1d6320a', + 'build_version' => '2749', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 1d74ddc54708afa3fac10c164a272b970f3f355b Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:45 -0800 Subject: [PATCH 15/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 1f8631020b..f6e1be7bf2 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2749-g1d6320a', - 'build_version' => '2749', + 'full_app_version' => 'v4.1.6-pre - build 2750-g1d6320a', + 'build_version' => '2750', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 452a9d6725e0e0865f44bc28b5a8abb720e57518 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:50 -0800 Subject: [PATCH 16/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index f6e1be7bf2..8774a17021 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2750-g1d6320a', - 'build_version' => '2750', + 'full_app_version' => 'v4.1.6-pre - build 2751-g1d6320a', + 'build_version' => '2751', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From f195073ac394f1e90cf63da94281d16bd59d8a0e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:52 -0800 Subject: [PATCH 17/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 8774a17021..08ed8b8c95 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2751-g1d6320a', - 'build_version' => '2751', + 'full_app_version' => 'v4.1.6-pre - build 2752-g1d6320a', + 'build_version' => '2752', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From dcf8e4f5efc9fae58b789907ca05bc921e2e4f1f Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:54 -0800 Subject: [PATCH 18/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 08ed8b8c95..3aa7395c25 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2752-g1d6320a', - 'build_version' => '2752', + 'full_app_version' => 'v4.1.6-pre - build 2753-g1d6320a', + 'build_version' => '2753', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From b6222abb7ca6f0dea6df0fef6c971117d7b8b26a Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 20:59:58 -0800 Subject: [PATCH 19/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 3aa7395c25..1ce2740288 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2753-g1d6320a', - 'build_version' => '2753', + 'full_app_version' => 'v4.1.6-pre - build 2754-g1d6320a', + 'build_version' => '2754', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From b59dd11304a504dbaf0a6bd1741264de07a16aba Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 21:00:00 -0800 Subject: [PATCH 20/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 1ce2740288..bb4066ab67 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2754-g1d6320a', - 'build_version' => '2754', + 'full_app_version' => 'v4.1.6-pre - build 2755-g1d6320a', + 'build_version' => '2755', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 3a1de3d2a5b7b0828b94560154b81b33447ce93d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 21:00:02 -0800 Subject: [PATCH 21/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index bb4066ab67..e1633f96fe 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2755-g1d6320a', - 'build_version' => '2755', + 'full_app_version' => 'v4.1.6-pre - build 2756-g1d6320a', + 'build_version' => '2756', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 9250b45e6ecfa4d145380d6d8b0f9aacacefb5f8 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 21:00:05 -0800 Subject: [PATCH 22/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index e1633f96fe..343c07a938 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2756-g1d6320a', - 'build_version' => '2756', + 'full_app_version' => 'v4.1.6-pre - build 2757-g1d6320a', + 'build_version' => '2757', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 8c15a4e0c69f1cdf45a9411d50d91e0d42cfede0 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 21:00:07 -0800 Subject: [PATCH 23/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 343c07a938..1bba4e6df0 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2757-g1d6320a', - 'build_version' => '2757', + 'full_app_version' => 'v4.1.6-pre - build 2758-g1d6320a', + 'build_version' => '2758', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 22fdd05314d45281d843de9de9de6444a64c41b6 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 22:34:07 -0800 Subject: [PATCH 24/30] Add UTF charset --- app/Http/Controllers/Api/ReportsController.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php index 3731122507..10f63da415 100644 --- a/app/Http/Controllers/Api/ReportsController.php +++ b/app/Http/Controllers/Api/ReportsController.php @@ -50,11 +50,9 @@ class ReportsController extends Controller $offset = request('offset', 0); $limit = request('limit', 50); $total = $actionlogs->count(); - $actionlogs = $actionlogs->orderBy($sort, $order); - $actionlogs = $actionlogs->skip($offset)->take($limit)->get(); - return (new ActionlogsTransformer)->transformActionlogs($actionlogs, $total); - + $actionlogs = $actionlogs->orderBy($sort, $order)->skip($offset)->take($limit)->get(); + return response()->json((new ActionlogsTransformer)->transformActionlogs($actionlogs, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE); } } From d98d06377ed7d67251375961290a32717b8c589b Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 22:34:53 -0800 Subject: [PATCH 25/30] Fixed #4098 - autolink URL and email addresses in listing --- app/Http/Transformers/AssetsTransformer.php | 11 ++++------- resources/views/partials/bootstrap-table.blade.php | 11 +++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 801b439bc3..2dbc9da726 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -86,24 +86,21 @@ class AssetsTransformer $decrypted = \App\Helpers\Helper::gracefulDecrypt($field,$asset->{$field->convertUnicodeDbSlug()}); $value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted')); - // $fields_array = [$field->convertUnicodeDbSlug() => $value]; - - $fields_array[$field->name] = [ 'field' => $field->convertUnicodeDbSlug(), - 'value' => $value + 'value' => $value, + 'field_format' => $field->format, ]; } else { $fields_array[$field->name] = [ 'field' => $field->convertUnicodeDbSlug(), - 'value' => $asset->{$field->convertUnicodeDbSlug()} + 'value' => $asset->{$field->convertUnicodeDbSlug()}, + 'field_format' => $field->format, ]; - //$fields_array = [$field->convertUnicodeDbSlug() => $asset->{$field->convertUnicodeDbSlug()}]; } - //array += $fields_array; $array['custom_fields'] = $fields_array; } } else { diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index a57980aaf2..8b32bd5ad0 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -354,7 +354,18 @@ // (for example, the locked icon for encrypted fields) var field_column_plain = field_column.replace(/<(?:.|\n)*?> ?/gm, ''); if ((row.custom_fields) && (row.custom_fields[field_column_plain])) { + + // If the field type needs special formatting, do that here + if ((row.custom_fields[field_column_plain].field_format) && (row.custom_fields[field_column_plain].value)) { + if (row.custom_fields[field_column_plain].field_format=='URL') { + return '' + row.custom_fields[field_column_plain].value + ''; + } else if (row.custom_fields[field_column_plain].field_format=='EMAIL') { + return '' + row.custom_fields[field_column_plain].value + ''; + } + } + console.log('NOT a URL!'); return row.custom_fields[field_column_plain].value; + } } From f79e5add586a5154deaeee03ab0b126b27dfba84 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 22:34:59 -0800 Subject: [PATCH 26/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 1bba4e6df0..275d1e3e08 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2758-g1d6320a', - 'build_version' => '2758', + 'full_app_version' => 'v4.1.6-pre - build 2761-g1d6320a', + 'build_version' => '2761', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 921f882680f0115bda774db7107eb4c032c5d10d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 22:35:01 -0800 Subject: [PATCH 27/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 275d1e3e08..f2190bf317 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2761-g1d6320a', - 'build_version' => '2761', + 'full_app_version' => 'v4.1.6-pre - build 2762-g1d6320a', + 'build_version' => '2762', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 4a6c18532b88769e41dca09fe7bd88b6cbfc9b6b Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 22:35:02 -0800 Subject: [PATCH 28/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index f2190bf317..4f9ad65183 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2762-g1d6320a', - 'build_version' => '2762', + 'full_app_version' => 'v4.1.6-pre - build 2763-g1d6320a', + 'build_version' => '2763', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 2adc1e8ba965ec686cb80b90dbc69523bae68f25 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 22:35:04 -0800 Subject: [PATCH 29/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 4f9ad65183..c192166483 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2763-g1d6320a', - 'build_version' => '2763', + 'full_app_version' => 'v4.1.6-pre - build 2764-g1d6320a', + 'build_version' => '2764', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a', From 09f20873df7c7048b5e6491d46ed2e490cb53645 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Nov 2017 22:35:05 -0800 Subject: [PATCH 30/30] Auto-bumped hash/version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index c192166483..6974b93f28 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,8 @@ 'v4.1.6-pre', - 'full_app_version' => 'v4.1.6-pre - build 2764-g1d6320a', - 'build_version' => '2764', + 'full_app_version' => 'v4.1.6-pre - build 2765-g1d6320a', + 'build_version' => '2765', 'prerelease_version' => '', 'hash_version' => 'g1d6320a', 'full_hash' => 'v4.1.5-2-g1d6320a',