DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source 
# Conflicts:
#	config/version.php
#	database/migrations/2018_02_22_160436_add_remote_user_settings.php
This commit is contained in:
snipe 2018-03-22 09:46:50 -07:00
parent 735840aafd abac3e7758
commit 96bab5697d
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/Accessory.php
View file

@ -172,6 +172,10 @@ class Accessory extends SnipeModel
$query->whereHas('company', function ($query) use ($search) { $query->whereHas('company', function ($query) use ($search) {
$query->where('companies.name', 'LIKE', '%'.$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) { })->orWhere(function ($query) use ($search) {
$query->whereHas('location', function ($query) use ($search) { $query->whereHas('location', function ($query) use ($search) {
$query->where('locations.name', 'LIKE', '%'.$search.'%'); $query->where('locations.name', 'LIKE', '%'.$search.'%');

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.1.14', 'app_version' => 'v4.1.15',
'full_app_version' => 'v4.1.14 - build 3446-g90bff709a', 'full_app_version' => 'v4.1.14 - build 3464-g735840a',
'build_version' => '3446', 'build_version' => '3464',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g90bff709a', 'hash_version' => 'g735840a',
'full_hash' => 'v4.1.14-55-g90bff709a', 'full_hash' => 'v4.1.14-3464-g735840a',
'branch' => 'master', 'branch' => 'master',
); );

2
database/migrations/2018_02_22_160436_add_remote_user_settings.php
View file

@ -16,6 +16,7 @@ class AddRemoteUserSettings extends Migration
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
$table->boolean('login_remote_user_enabled')->default(0); $table->boolean('login_remote_user_enabled')->default(0);
$table->boolean('login_common_disabled')->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) { Schema::table('settings', function (Blueprint $table) {
$table->dropColumn('login_remote_user_enabled'); $table->dropColumn('login_remote_user_enabled');
$table->dropColumn('login_common_disabled'); $table->dropColumn('login_common_disabled');
$table->dropColumn('login_remote_user_custom_logout_url');
}); });
} }
} }