diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index a589c8be66..e006b24c3e 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -172,6 +172,10 @@ class Accessory extends SnipeModel $query->whereHas('company', function ($query) use ($search) { $query->where('companies.name', 'LIKE', '%'.$search.'%'); }); + })->orWhere(function ($query) use ($search) { + $query->whereHas('manufacturer', function ($query) use ($search) { + $query->where('manufacturers.name', 'LIKE', '%'.$search.'%'); + }); })->orWhere(function ($query) use ($search) { $query->whereHas('location', function ($query) use ($search) { $query->where('locations.name', 'LIKE', '%'.$search.'%'); diff --git a/config/version.php b/config/version.php index bf0730a475..2d5e7c3f97 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.1.14', - 'full_app_version' => 'v4.1.14 - build 3446-g90bff709a', - 'build_version' => '3446', + 'app_version' => 'v4.1.15', + 'full_app_version' => 'v4.1.14 - build 3464-g735840a', + 'build_version' => '3464', 'prerelease_version' => '', - 'hash_version' => 'g90bff709a', - 'full_hash' => 'v4.1.14-55-g90bff709a', + 'hash_version' => 'g735840a', + 'full_hash' => 'v4.1.14-3464-g735840a', 'branch' => 'master', ); diff --git a/database/migrations/2018_02_22_160436_add_remote_user_settings.php b/database/migrations/2018_02_22_160436_add_remote_user_settings.php index b0fae55e5d..5756747d52 100644 --- a/database/migrations/2018_02_22_160436_add_remote_user_settings.php +++ b/database/migrations/2018_02_22_160436_add_remote_user_settings.php @@ -16,6 +16,7 @@ class AddRemoteUserSettings extends Migration Schema::table('settings', function (Blueprint $table) { $table->boolean('login_remote_user_enabled')->default(0); $table->boolean('login_common_disabled')->default(0); + $table->string('login_remote_user_custom_logout_url')->default(""); }); } @@ -29,6 +30,7 @@ class AddRemoteUserSettings extends Migration Schema::table('settings', function (Blueprint $table) { $table->dropColumn('login_remote_user_enabled'); $table->dropColumn('login_common_disabled'); + $table->dropColumn('login_remote_user_custom_logout_url'); }); } }