From f254958db9ff16e1458dc7ef5fb4f051e85580b9 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 17 Jan 2018 06:48:14 -0800 Subject: [PATCH 1/5] Check if db_column foield already exists --- ...01_25_063357_fix_utf8_custom_field_column_names.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php b/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php index 5e8379bdad..7f84bc2eb9 100644 --- a/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php +++ b/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php @@ -52,10 +52,12 @@ class FixUtf8CustomFieldColumnNames extends Migration $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform(); $platform->registerDoctrineTypeMapping('enum', 'string'); - Schema::table('custom_fields', function ($table) { - $table->string('db_column')->nullable(); - $table->text('help_text')->nullable(); - }); + if (!Schema::hasColumn('custom_fields', 'db_column')) { + Schema::table('custom_fields', function ($table) { + $table->string('db_column')->nullable(); + $table->text('help_text')->nullable(); + }); + } foreach(CustomField::all() as $field) { From 138313dcb94da6b571489adbeef44ee90b8c8eac Mon Sep 17 00:00:00 2001 From: fordster78 Date: Wed, 17 Jan 2018 18:58:03 +0000 Subject: [PATCH 2/5] Setup changes (#4813) * Add Asset Tag settings to Setup * Add Locale Settings to Setup * Add multiple company support to setup * Changed the locale label name from 'site_name' to locale Added default value for language to 'en' and multiple companies support to 0 (false) Switched out the old Input facade to the preferred $request->input method for the setup page. --- app/Http/Controllers/SettingsController.php | 29 +++++----- resources/views/setup/user.blade.php | 63 +++++++++++++++++++++ 2 files changed, 79 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 125c91bd7d..543d956ddb 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -67,7 +67,7 @@ class SettingsController extends Controller $start_settings['url_config'] = url('/'); $start_settings['real_url'] = $pageURL; - + // Curl the .env file to make sure it's not accessible via a browser $ch = curl_init($protocol . $host.'/.env'); curl_setopt($ch, CURLOPT_HEADER, true); // we want headers @@ -150,28 +150,31 @@ class SettingsController extends Controller $user = new User; - $user->first_name = $data['first_name']= e(Input::get('first_name')); - $user->last_name = e(Input::get('last_name')); - $user->email = $data['email'] = e(Input::get('email')); + $user->first_name = $data['first_name']= $request->input('first_name'); + $user->last_name = $request->input('last_name'); + $user->email = $data['email'] = $request->input('email'); $user->activated = 1; $permissions = array('superuser' => 1); $user->permissions = json_encode($permissions); - $user->username = $data['username'] = e(Input::get('username')); - $user->password = bcrypt(Input::get('password')); - $data['password'] = Input::get('password'); + $user->username = $data['username'] = $request->input('username'); + $user->password = bcrypt($request->input('password')); + $data['password'] = $request->input('password'); $settings = new Setting; - $settings->site_name = e(Input::get('site_name')); - $settings->alert_email = e(Input::get('email')); + $settings->full_multiple_companies_support = $request->input('full_multiple_companies_support', 0); + $settings->site_name = $request->input('site_name'); + $settings->alert_email = $request->input('email'); $settings->alerts_enabled = 1; $settings->pwd_secure_min = 10; $settings->brand = 1; - $settings->locale = 'en'; - $settings->default_currency = 'USD'; + $settings->locale = $request->input('locale', 'en'); + $settings->default_currency = $request->input('default_currency', "USD"); $settings->user_id = 1; - $settings->email_domain = e(Input::get('email_domain')); - $settings->email_format = e(Input::get('email_format')); + $settings->email_domain = $request->input('email_domain'); + $settings->email_format = $request->input('email_format'); $settings->next_auto_tag_base = 1; + $settings->auto_increment_assets = $request->input('auto_increment_assets', 0); + $settings->auto_increment_prefix = $request->input('auto_increment_prefix'); if ((!$user->isValid()) || (!$settings->isValid())) { diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php index 59bda40593..558e7fc6c4 100644 --- a/resources/views/setup/user.blade.php +++ b/resources/views/setup/user.blade.php @@ -15,6 +15,7 @@ Create a User :: {{ csrf_field() }}
+
@@ -25,6 +26,68 @@ Create a User ::
+
+ + +
+ {{ Form::label('locale', trans('admin/settings/general.default_language')) }} + {!! Form::locales('locale', Input::old('locale', "en"), 'select2') !!} + + {!! $errors->first('locale', ':message') !!} +
+ + +
+ {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }} + {{ Form::text('default_currency', Input::old('default_currency'), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} + + {!! $errors->first('default_currency', ':message') !!} +
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ {{ Form::label('full_multiple_companies_support', trans('admin/settings/general.full_multiple_companies_support_text')) }} +
+ +
+
+ + +
+ +
+ +
+ {{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }} + {{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix'), array('class' => 'form-control')) }} + + {!! $errors->first('auto_increment_prefix', ':message') !!} +
+ +
+ {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }} + {{ Form::text('zerofill_count', Input::old('zerofill_count', 5), array('class' => 'form-control')) }} + + {!! $errors->first('zerofill_count', ':message') !!} +
+
+ +
From b383ebee487ff2be8648d38bec9a80a3115e6adf Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 17 Jan 2018 10:58:51 -0800 Subject: [PATCH 3/5] Add @fordster78 as a contributor --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 08f923c0d1..5c33ed4b2b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -847,6 +847,15 @@ "contributions": [ "code" ] + }, + { + "login": "fordster78", + "name": "fordster78", + "avatar_url": "https://avatars3.githubusercontent.com/u/27958330?v=4", + "profile": "https://github.com/fordster78", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index 94ea0af56a..37873209c3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://img.shields.io/badge/Shipping_faster_with-ZenHub-5e60ba.svg)](https://zenhub.io) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-91-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-92-orange.svg?style=flat-square)](#contributors) ## Snipe-IT - Open Source Asset Management System @@ -69,6 +69,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Jason Spriggs](http://jasonspriggs.com)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [
Nate Felton](http://n8felton.wordpress.com)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [
Manasses Ferreira](http://homepages.dcc.ufmg.br/~manassesferreira)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [
Steve](https://github.com/steveelwood)
[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [
matc](http://twitter.com/matc)
[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [
Cole R. Davis](http://www.davisracingteam.com)
[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [
gibsonjoshua55](https://github.com/gibsonjoshua55)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") | | [
Robin Temme](https://github.com/zwerch)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [
Iman](https://github.com/imanghafoori1)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [
Richard Hofman](https://github.com/richardhofman6)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [
gizzmojr](https://github.com/gizzmojr)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [
Jenny Li](https://github.com/imjennyli)
[πŸ“–](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | [
Geoff Young](https://github.com/GeoffYoung)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=GeoffYoung "Code") | [
Elliot Blackburn](http://www.elliotblackburn.com)
[πŸ“–](https://github.com/snipe/snipe-it/commits?author=BlueHatbRit "Documentation") | | [
TΓ΅nis Ormisson](http://andmemasin.eu)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=TonisOrmisson "Code") | [
Nicolai Essig](http://www.nicolai-essig.de)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=thakilla "Code") | [
Danielle](https://github.com/techincolor)
[πŸ“–](https://github.com/snipe/snipe-it/commits?author=techincolor "Documentation") | [
Lawrence](https://github.com/TheVakman)
[⚠️](https://github.com/snipe/snipe-it/commits?author=TheVakman "Tests") [πŸ›](https://github.com/snipe/snipe-it/issues?q=author%3ATheVakman "Bug reports") | [
uknzaeinozpas](https://github.com/uknzaeinozpas)
[⚠️](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Tests") [πŸ’»](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Code") | [
Ryan](https://github.com/Gelob)
[πŸ“–](https://github.com/snipe/snipe-it/commits?author=Gelob "Documentation") | [
vcordes79](https://github.com/vcordes79)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=vcordes79 "Code") | +| [
fordster78](https://github.com/fordster78)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=fordster78 "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! From 8fb991110ebdb1e3dd38baa40f91b83b442d152c Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 17 Jan 2018 12:10:28 -0800 Subject: [PATCH 4/5] Fixed #4652 - asset not correctly checking out to user on creation --- app/Observers/AssetObserver.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php index 7cac06ed29..df466d3753 100644 --- a/app/Observers/AssetObserver.php +++ b/app/Observers/AssetObserver.php @@ -42,13 +42,7 @@ class AssetObserver $logAction->log_meta = json_encode($changed); $logAction->logaction('update'); - } else { - - \Log::debug('Something else happened'); - \Log::debug($asset->getOriginal()['assigned_to'].' == '.$asset->getAttributes()['assigned_to']); - \Log::debug($asset->getOriginal()['next_audit_date'].' == '.$asset->getAttributes()['next_audit_date']); - \Log::debug($asset->getOriginal()['last_checkout'].' == '.$asset->getAttributes()['last_checkout']); - } + } } From 9e605e0f798da469ca2c6b3182964e2c194938ae Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 17 Jan 2018 12:11:39 -0800 Subject: [PATCH 5/5] Bumped hash --- config/version.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/version.php b/config/version.php index cf1d18bb0e..10b395dc9f 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.1.10-pre', - 'full_app_version' => 'v4.1.10-pre - build 3185-g5b15a2f', - 'build_version' => '3185', + 'full_app_version' => 'v4.1.10-pre - build 3204-g09eff88', + 'build_version' => '3204', 'prerelease_version' => '', - 'hash_version' => 'g5b15a2f', - 'full_hash' => 'v4.1.10-pre-55-g5b15a2f', + 'hash_version' => 'g09eff88', + 'full_hash' => 'v4.1.10-pre-74-g09eff88', 'branch' => 'develop', );