@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | public function getIndex() { |
| 28 | 28 | $data = []; |
| 29 | 29 | $data['result'] = DB::table("users") |
| 30 | - ->join("cb_roles","cb_roles.id","=","cb_roles_id") |
|
| 31 | - ->select("users.*","cb_roles.name as cb_roles_name") |
|
| 30 | + ->join("cb_roles", "cb_roles.id", "=", "cb_roles_id") |
|
| 31 | + ->select("users.*", "cb_roles.name as cb_roles_name") |
|
| 32 | 32 | ->get(); |
| 33 | - return view($this->view.'.index',$data); |
|
| 33 | + return view($this->view.'.index', $data); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | public function getAdd() { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | public function postAddSave() { |
| 43 | 43 | try { |
| 44 | - cb()->validation(['name', 'email','password','cb_roles_id']); |
|
| 44 | + cb()->validation(['name', 'email', 'password', 'cb_roles_id']); |
|
| 45 | 45 | |
| 46 | 46 | $user = []; |
| 47 | 47 | $user['name'] = request('name'); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $user['cb_roles_id'] = request('cb_roles_id'); |
| 51 | 51 | DB::table('users')->insert($user); |
| 52 | 52 | |
| 53 | - return cb()->redirect(route("DeveloperUsersControllerGetIndex"),"New user has been created!","success"); |
|
| 53 | + return cb()->redirect(route("DeveloperUsersControllerGetIndex"), "New user has been created!", "success"); |
|
| 54 | 54 | |
| 55 | 55 | } catch (CBValidationException $e) { |
| 56 | 56 | return cb()->redirectBack($e->getMessage()); |
@@ -66,16 +66,16 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function postEditSave($id) { |
| 68 | 68 | try { |
| 69 | - cb()->validation(['name', 'email','cb_roles_id']); |
|
| 69 | + cb()->validation(['name', 'email', 'cb_roles_id']); |
|
| 70 | 70 | |
| 71 | 71 | $user = []; |
| 72 | 72 | $user['name'] = request('name'); |
| 73 | 73 | $user['email'] = request('email'); |
| 74 | - if(request('password')) $user['password'] = Hash::make(request('password')); |
|
| 74 | + if (request('password')) $user['password'] = Hash::make(request('password')); |
|
| 75 | 75 | $user['cb_roles_id'] = request('cb_roles_id'); |
| 76 | - DB::table('users')->where('id',$id)->update($user); |
|
| 76 | + DB::table('users')->where('id', $id)->update($user); |
|
| 77 | 77 | |
| 78 | - return cb()->redirect(route("DeveloperUsersControllerGetIndex"),"The user has been updated!","success"); |
|
| 78 | + return cb()->redirect(route("DeveloperUsersControllerGetIndex"), "The user has been updated!", "success"); |
|
| 79 | 79 | |
| 80 | 80 | } catch (CBValidationException $e) { |
| 81 | 81 | return cb()->redirectBack($e->getMessage()); |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | public function getDelete($id) { |
| 86 | - DB::table("users")->where("id",$id)->delete(); |
|
| 87 | - return cb()->redirectBack("The user has been deleted!","success"); |
|
| 86 | + DB::table("users")->where("id", $id)->delete(); |
|
| 87 | + return cb()->redirectBack("The user has been deleted!", "success"); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | } |
| 91 | 91 | \ No newline at end of file |
@@ -24,22 +24,22 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | public function getIndex() { |
| 26 | 26 | $data = []; |
| 27 | - return view($this->view.".index",$data); |
|
| 27 | + return view($this->view.".index", $data); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function getAdd() { |
| 31 | 31 | $data = []; |
| 32 | 32 | $data['form_title'] = "Add Menu"; |
| 33 | 33 | $data['form_url'] = route('DeveloperMenusControllerPostAddSave'); |
| 34 | - $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get(); |
|
| 34 | + $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get(); |
|
| 35 | 35 | return view($this->view.".form", $data); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public function getEdit($id) { |
| 39 | 39 | $data = []; |
| 40 | 40 | $data['form_title'] = "Edit Menu"; |
| 41 | - $data['form_url'] = route('DeveloperMenusControllerPostEditSave',['id'=>$id]); |
|
| 42 | - $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get(); |
|
| 41 | + $data['form_url'] = route('DeveloperMenusControllerPostEditSave', ['id'=>$id]); |
|
| 42 | + $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get(); |
|
| 43 | 43 | $data['row'] = cb()->find("cb_menus", $id); |
| 44 | 44 | return view($this->view.".form", $data); |
| 45 | 45 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $menu['name'] = request('name'); |
| 53 | 53 | $menu['icon'] = request('icon'); |
| 54 | 54 | $menu['type'] = request('type'); |
| 55 | - if(request('type') == 'module') { |
|
| 55 | + if (request('type') == 'module') { |
|
| 56 | 56 | $menu['cb_modules_id'] = request('cb_modules_id'); |
| 57 | 57 | }elseif (request('type') == 'url') { |
| 58 | 58 | $menu['path'] = request('url_value'); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | DB::table("cb_menus")->insert($menu); |
| 64 | 64 | |
| 65 | - return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been added!","success"); |
|
| 65 | + return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been added!", "success"); |
|
| 66 | 66 | |
| 67 | 67 | } catch (CBValidationException $e) { |
| 68 | 68 | return cb()->redirectBack($e->getMessage()); |
@@ -77,16 +77,16 @@ discard block |
||
| 77 | 77 | $menu['name'] = request('name'); |
| 78 | 78 | $menu['icon'] = request('icon'); |
| 79 | 79 | $menu['type'] = request('type'); |
| 80 | - if(request('type') == 'module') { |
|
| 80 | + if (request('type') == 'module') { |
|
| 81 | 81 | $menu['cb_modules_id'] = request('cb_modules_id'); |
| 82 | 82 | }elseif (request('type') == 'url') { |
| 83 | 83 | $menu['path'] = request('url_value'); |
| 84 | 84 | }elseif (request('type') == 'path') { |
| 85 | 85 | $menu['path'] = request('path_value'); |
| 86 | 86 | } |
| 87 | - DB::table("cb_menus")->where("id",$id)->update($menu); |
|
| 87 | + DB::table("cb_menus")->where("id", $id)->update($menu); |
|
| 88 | 88 | |
| 89 | - return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been saved!","success"); |
|
| 89 | + return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been saved!", "success"); |
|
| 90 | 90 | |
| 91 | 91 | } catch (CBValidationException $e) { |
| 92 | 92 | return cb()->redirectBack($e->getMessage()); |
@@ -99,20 +99,20 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | $menus = request('menus'); |
| 101 | 101 | $menus = json_decode($menus, true); |
| 102 | - if($menus) { |
|
| 102 | + if ($menus) { |
|
| 103 | 103 | $menus = $menus[0]; |
| 104 | - if($menus) { |
|
| 105 | - foreach($menus as $i=>$menu) { |
|
| 104 | + if ($menus) { |
|
| 105 | + foreach ($menus as $i=>$menu) { |
|
| 106 | 106 | $id = $menu['id']; |
| 107 | - cb()->update("cb_menus",$id,["sort_number"=>$i]); |
|
| 108 | - if($menu['children'][0]) { |
|
| 109 | - foreach($menu['children'][0] as $ii=>$sub) { |
|
| 107 | + cb()->update("cb_menus", $id, ["sort_number"=>$i]); |
|
| 108 | + if ($menu['children'][0]) { |
|
| 109 | + foreach ($menu['children'][0] as $ii=>$sub) { |
|
| 110 | 110 | $id = $sub['id']; |
| 111 | - cb()->update("cb_menus",$id,["sort_number"=>$ii,"parent_cb_menus_id"=>$menu['id']]); |
|
| 112 | - if($sub['children'][0]) { |
|
| 113 | - foreach($sub['children'][0] as $iii=>$subsub) { |
|
| 111 | + cb()->update("cb_menus", $id, ["sort_number"=>$ii, "parent_cb_menus_id"=>$menu['id']]); |
|
| 112 | + if ($sub['children'][0]) { |
|
| 113 | + foreach ($sub['children'][0] as $iii=>$subsub) { |
|
| 114 | 114 | $id = $subsub['id']; |
| 115 | - cb()->update("cb_menus",$id,["sort_number"=>$iii,"parent_cb_menus_id"=>$sub['id']]); |
|
| 115 | + cb()->update("cb_menus", $id, ["sort_number"=>$iii, "parent_cb_menus_id"=>$sub['id']]); |
|
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | } |
@@ -121,17 +121,17 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - return response()->json(['api_status'=>1,'api_message'=>'success']); |
|
| 124 | + return response()->json(['api_status'=>1, 'api_message'=>'success']); |
|
| 125 | 125 | |
| 126 | 126 | } catch (CBValidationException $e) { |
| 127 | - return response()->json(['api_status'=>0,'api_message'=>$e->getMessage()]); |
|
| 127 | + return response()->json(['api_status'=>0, 'api_message'=>$e->getMessage()]); |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | public function getDelete($id) { |
| 132 | - DB::table("cb_menus")->where("id",$id)->delete(); |
|
| 132 | + DB::table("cb_menus")->where("id", $id)->delete(); |
|
| 133 | 133 | |
| 134 | - return cb()->redirectBack("The menu has been deleted!","success"); |
|
| 134 | + return cb()->redirectBack("The menu has been deleted!", "success"); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | } |
| 138 | 138 | \ No newline at end of file |
@@ -25,12 +25,12 @@ discard block |
||
| 25 | 25 | public function getIndex() { |
| 26 | 26 | $data = []; |
| 27 | 27 | $data['result'] = DB::table("cb_roles")->get(); |
| 28 | - return view($this->view.".index",$data); |
|
| 28 | + return view($this->view.".index", $data); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | public function getAdd() { |
| 32 | 32 | $data = []; |
| 33 | - $data['menus'] = DB::table("cb_menus")->orderBy("name","asc")->get(); |
|
| 33 | + $data['menus'] = DB::table("cb_menus")->orderBy("name", "asc")->get(); |
|
| 34 | 34 | return view($this->view.".add", $data); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -48,17 +48,17 @@ discard block |
||
| 48 | 48 | $privilege = []; |
| 49 | 49 | $privilege["cb_roles_id"] = $roles_id; |
| 50 | 50 | $privilege["cb_menus_id"] = $menus_id; |
| 51 | - $privilege["can_browse"] = $menu['can_browse']?:0; |
|
| 52 | - $privilege["can_create"] = $menu['can_create']?:0; |
|
| 53 | - $privilege["can_read"] = $menu['can_read']?:0; |
|
| 54 | - $privilege["can_update"] = $menu['can_update']?:0; |
|
| 55 | - $privilege["can_delete"] = $menu['can_delete']?:0; |
|
| 51 | + $privilege["can_browse"] = $menu['can_browse'] ?: 0; |
|
| 52 | + $privilege["can_create"] = $menu['can_create'] ?: 0; |
|
| 53 | + $privilege["can_read"] = $menu['can_read'] ?: 0; |
|
| 54 | + $privilege["can_update"] = $menu['can_update'] ?: 0; |
|
| 55 | + $privilege["can_delete"] = $menu['can_delete'] ?: 0; |
|
| 56 | 56 | DB::table("cb_role_privileges")->insert($privilege); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | DB::commit(); |
| 60 | 60 | |
| 61 | - return cb()->redirect(route("DeveloperRolesControllerGetIndex"),"The role has been saved!","success"); |
|
| 61 | + return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been saved!", "success"); |
|
| 62 | 62 | |
| 63 | 63 | } catch (CBValidationException $e) { |
| 64 | 64 | return cb()->redirectBack($e->getMessage()); |
@@ -73,21 +73,21 @@ discard block |
||
| 73 | 73 | $data['row'] = cb()->find("cb_roles", $id); |
| 74 | 74 | |
| 75 | 75 | $menus = DB::table("cb_menus") |
| 76 | - ->leftjoin("cb_role_privileges",function($join) use ($id) { |
|
| 77 | - $join->on("cb_role_privileges.cb_menus_id","=","cb_menus.id")->where("cb_role_privileges.cb_roles_id", $id); |
|
| 76 | + ->leftjoin("cb_role_privileges", function($join) use ($id) { |
|
| 77 | + $join->on("cb_role_privileges.cb_menus_id", "=", "cb_menus.id")->where("cb_role_privileges.cb_roles_id", $id); |
|
| 78 | 78 | }) |
| 79 | - ->orderBy("cb_menus.name","asc") |
|
| 80 | - ->select("cb_menus.*","can_browse","can_create","can_read","can_update","can_delete") |
|
| 79 | + ->orderBy("cb_menus.name", "asc") |
|
| 80 | + ->select("cb_menus.*", "can_browse", "can_create", "can_read", "can_update", "can_delete") |
|
| 81 | 81 | ->get(); |
| 82 | 82 | $data['menus'] = $menus; |
| 83 | 83 | |
| 84 | - return view($this->view.".edit",$data); |
|
| 84 | + return view($this->view.".edit", $data); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | private function existsPrivilege($cb_roles_id, $cb_menus_id) { |
| 88 | - if($row = cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id])) { |
|
| 88 | + if ($row = cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id])) { |
|
| 89 | 89 | return $row->id; |
| 90 | - }else{ |
|
| 90 | + } else { |
|
| 91 | 91 | return null; |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -96,25 +96,25 @@ discard block |
||
| 96 | 96 | try { |
| 97 | 97 | cb()->validation(['name', 'menus']); |
| 98 | 98 | |
| 99 | - cb()->updateCompact("cb_roles",$id,['name']); |
|
| 99 | + cb()->updateCompact("cb_roles", $id, ['name']); |
|
| 100 | 100 | |
| 101 | 101 | foreach (request("menus") as $menus_id => $menu) { |
| 102 | 102 | $privilege = []; |
| 103 | 103 | $privilege["cb_roles_id"] = $id; |
| 104 | 104 | $privilege["cb_menus_id"] = $menus_id; |
| 105 | - $privilege["can_browse"] = $menu['can_browse']?:0; |
|
| 106 | - $privilege["can_create"] = $menu['can_create']?:0; |
|
| 107 | - $privilege["can_read"] = $menu['can_read']?:0; |
|
| 108 | - $privilege["can_update"] = $menu['can_update']?:0; |
|
| 109 | - $privilege["can_delete"] = $menu['can_delete']?:0; |
|
| 110 | - if($privilege_id = $this->existsPrivilege($id, $menus_id)) { |
|
| 105 | + $privilege["can_browse"] = $menu['can_browse'] ?: 0; |
|
| 106 | + $privilege["can_create"] = $menu['can_create'] ?: 0; |
|
| 107 | + $privilege["can_read"] = $menu['can_read'] ?: 0; |
|
| 108 | + $privilege["can_update"] = $menu['can_update'] ?: 0; |
|
| 109 | + $privilege["can_delete"] = $menu['can_delete'] ?: 0; |
|
| 110 | + if ($privilege_id = $this->existsPrivilege($id, $menus_id)) { |
|
| 111 | 111 | DB::table("cb_role_privileges")->where("id", $privilege_id)->update($privilege); |
| 112 | - }else{ |
|
| 112 | + } else { |
|
| 113 | 113 | DB::table("cb_role_privileges")->insert($privilege); |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - return cb()->redirect(route("DeveloperRolesControllerGetIndex"),"The role has been saved!","success"); |
|
| 117 | + return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been saved!", "success"); |
|
| 118 | 118 | |
| 119 | 119 | } catch (CBValidationException $e) { |
| 120 | 120 | |
@@ -124,9 +124,9 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | public function getDelete($id) { |
| 126 | 126 | DB::table("cb_roles")->where("id", $id)->delete(); |
| 127 | - DB::table("cb_role_privileges")->where("cb_roles_id",$id)->delete(); |
|
| 127 | + DB::table("cb_role_privileges")->where("cb_roles_id", $id)->delete(); |
|
| 128 | 128 | |
| 129 | - return cb()->redirectBack("The role has been deleted!","success"); |
|
| 129 | + return cb()->redirectBack("The role has been deleted!", "success"); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | } |
| 133 | 133 | \ No newline at end of file |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | public function getIndex() { |
| 16 | 16 | $data = []; |
| 17 | 17 | $data['page_title'] = "Dashboard"; |
| 18 | - return view('crudbooster::dev_layouts.modules.dashboard',$data); |
|
| 18 | + return view('crudbooster::dev_layouts.modules.dashboard', $data); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | public function getIndex() { |
| 27 | 27 | $data = []; |
| 28 | 28 | $data['result'] = DB::table("cb_modules")->get(); |
| 29 | - return view($this->view.'.index',$data); |
|
| 29 | + return view($this->view.'.index', $data); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | public function getAdd() { |
@@ -37,11 +37,11 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | public function postAddSave() { |
| 39 | 39 | try { |
| 40 | - cb()->validation(['name', 'table','icon']); |
|
| 40 | + cb()->validation(['name', 'table', 'icon']); |
|
| 41 | 41 | |
| 42 | 42 | (new ModuleGenerator(request('table'), request('name'), request('icon')))->make(); |
| 43 | 43 | |
| 44 | - return cb()->redirect(route("DeveloperModulesControllerGetIndex"),"New module has been created!","success"); |
|
| 44 | + return cb()->redirect(route("DeveloperModulesControllerGetIndex"), "New module has been created!", "success"); |
|
| 45 | 45 | |
| 46 | 46 | } catch (CBValidationException $e) { |
| 47 | 47 | return cb()->redirectBack($e->getMessage()); |
@@ -58,9 +58,9 @@ discard block |
||
| 58 | 58 | try { |
| 59 | 59 | cb()->validation(['name', 'icon']); |
| 60 | 60 | |
| 61 | - cb()->updateCompact("cb_modules", $id, ['name','icon']); |
|
| 61 | + cb()->updateCompact("cb_modules", $id, ['name', 'icon']); |
|
| 62 | 62 | |
| 63 | - return cb()->redirect(route("DeveloperModulesControllerGetIndex"),"Module has been updated!","success"); |
|
| 63 | + return cb()->redirect(route("DeveloperModulesControllerGetIndex"), "Module has been updated!", "success"); |
|
| 64 | 64 | |
| 65 | 65 | } catch (CBValidationException $e) { |
| 66 | 66 | return cb()->redirectBack($e->getMessage()); |
@@ -68,12 +68,12 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | public function getDelete($id) { |
| 71 | - $module = cb()->find("cb_modules",$id); |
|
| 71 | + $module = cb()->find("cb_modules", $id); |
|
| 72 | 72 | @unlink(app_path("Http/Controllers/".$module->controller)); |
| 73 | 73 | DB::table("cb_modules")->where("id", $id)->delete(); |
| 74 | 74 | DB::table("cb_menus")->where("cb_modules_id", $id)->delete(); |
| 75 | 75 | |
| 76 | - return cb()->redirectBack("The module has been deleted!","success"); |
|
| 76 | + return cb()->redirectBack("The module has been deleted!", "success"); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | } |
| 80 | 80 | \ No newline at end of file |
@@ -20,9 +20,9 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | public function indexRender($row, $column) |
| 22 | 22 | { |
| 23 | - if($column->getFormat()) { |
|
| 23 | + if ($column->getFormat()) { |
|
| 24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
| 25 | - }else{ |
|
| 25 | + } else { |
|
| 26 | 26 | return $row->{$column->getField()}; |
| 27 | 27 | } |
| 28 | 28 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) { |
| 36 | 36 | $data = DB::table($table); |
| 37 | - if($SQLCondition && is_callable($SQLCondition)) { |
|
| 37 | + if ($SQLCondition && is_callable($SQLCondition)) { |
|
| 38 | 38 | $data = call_user_func($SQLCondition, $data); |
| 39 | 39 | }elseif ($SQLCondition && is_string($SQLCondition)) { |
| 40 | 40 | $data->whereRaw($SQLCondition); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $data = $data->get(); |
| 43 | 43 | $options = []; |
| 44 | 44 | foreach ($data as $d) { |
| 45 | - $options[ $d->$key_field ] = $d->$display_field; |
|
| 45 | + $options[$d->$key_field] = $d->$display_field; |
|
| 46 | 46 | } |
| 47 | 47 | $this->options($options); |
| 48 | 48 | } |
@@ -19,9 +19,9 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | public function query($query, $column) |
| 21 | 21 | { |
| 22 | - if($column->getOptionsFromTable()) { |
|
| 22 | + if ($column->getOptionsFromTable()) { |
|
| 23 | 23 | $option = $column->getOptionsFromTable(); |
| 24 | - $query->join($option["table"],$option["table"].'.'.$option["key_field"],"=", $column->getName()); |
|
| 24 | + $query->join($option["table"], $option["table"].'.'.$option["key_field"], "=", $column->getName()); |
|
| 25 | 25 | $query->addSelect($option['table'].'.'.$option['display_field'].' as '.$option['table'].'_'.$option['display_field']); |
| 26 | 26 | } |
| 27 | 27 | return $query; |
@@ -33,13 +33,13 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | public function indexRender($row, $column) |
| 35 | 35 | { |
| 36 | - if($column->getOptionsFromTable()) { |
|
| 36 | + if ($column->getOptionsFromTable()) { |
|
| 37 | 37 | $option = $column->getOptionsFromTable(); |
| 38 | 38 | return $row->{ $option['table'].'_'.$option['display_field'] }; |
| 39 | - }else{ |
|
| 39 | + } else { |
|
| 40 | 40 | $option = $column->getOptions(); |
| 41 | 41 | $key = $row->{ $column->getField() }; |
| 42 | - return @$option[ $key ]; |
|
| 42 | + return @$option[$key]; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('cb_menus', function (Blueprint $table) { |
|
| 15 | + Schema::create('cb_menus', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments("id"); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string("icon")->nullable(); |