lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-02-21 04:42:03 -08:00
commit 4ed2ef6298
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Models/Location.php
View file

@ -9,6 +9,7 @@ use App\Presenters\Presentable;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
use DB;
class Location extends SnipeModel class Location extends SnipeModel
{ {
@ -184,7 +185,7 @@ class Location extends SnipeModel
}) })
// Ugly, ugly code because Laravel sucks at self-joins // Ugly, ugly code because Laravel sucks at self-joins
->orWhere(function ($query) use ($search) { ->orWhere(function ($query) use ($search) {
$query->whereRaw("parent_id IN (select id from locations where name LIKE '%".$search."%') "); $query->whereRaw("parent_id IN (select id from ".DB::getTablePrefix()."locations where name LIKE '%".$search."%') ");
}); });
}); });

2
resources/views/partials/bootstrap-table.blade.php
View file

@ -55,7 +55,7 @@
paginationLastText: "{{ trans('general.last') }}", paginationLastText: "{{ trans('general.last') }}",
paginationPreText: "{{ trans('general.previous') }}", paginationPreText: "{{ trans('general.previous') }}",
paginationNextText: "{{ trans('general.next') }}", paginationNextText: "{{ trans('general.next') }}",
pageList: ['20', '30','50','100','150','200', '500'], pageList: ['10','20', '30','50','100','150','200', '500'],
paginationVAlign: 'both', paginationVAlign: 'both',
formatLoadingMessage: function () { formatLoadingMessage: function () {
return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>'; return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>';