Skip to content

Commit

Permalink
bug fix datatable_where child select type
Browse files Browse the repository at this point in the history
  • Loading branch information
fherryfherry committed May 19, 2017
1 parent a873ac4 commit f70d0b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/views/admin_template.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>{{ ($page_title)?CRUDBooster::getSetting('appname').': '.strip_tags($page_title):"Admin Area" }}</title>
<meta name="csrf-token" content="{{ csrf_token() }}" />
<meta name='generator' content='CRUDBooster 5.4.0.0'/>
<meta name='generator' content='CRUDBooster 5.4.0.1'/>
<meta name='robots' content='noindex,nofollow'/>
<link rel="shortcut icon" href="{{ CRUDBooster::getSetting('favicon')?asset(CRUDBooster::getSetting('favicon')):asset('vendor/crudbooster/assets/logo_crudbooster.png') }}">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function uploadFiles{{$name_column}}(event)
if($col['datatable']) {
$tableJoin = explode(',',$col['datatable'])[0];
$titleField = explode(',',$col['datatable'])[1];
if($col['datatable_where']) {
if(!$col['datatable_where']) {
$data = CRUDBooster::get($tableJoin,NULL,"$titleField ASC");
}else{
$data = CRUDBooster::get($tableJoin,$col['datatable_where'],"$titleField ASC");
Expand Down

0 comments on commit f70d0b6

Please sign in to comment.