Passed
Push — master ( 1d5cc5...1898a0 )
by Ferry
07:21 queued 04:04
created
src/database/migrations/2016_08_07_152421_table_role_privileges.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('cb_role_privileges', function (Blueprint $table) {
15
+        Schema::create('cb_role_privileges', function(Blueprint $table) {
16 16
             $table->increments("id");
17 17
             $table->integer("cb_roles_id");
18 18
             $table->integer("cb_menus_id");
Please login to merge, or discard this patch.
src/database/migrations/2016_08_07_152421_table_roles.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('cb_roles', function (Blueprint $table) {
15
+        Schema::create('cb_roles', function(Blueprint $table) {
16 16
             $table->increments("id");
17 17
             $table->string('name');
18 18
         });
Please login to merge, or discard this patch.
src/database/migrations/2016_08_07_152421_table_modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('cb_modules', function (Blueprint $table) {
15
+        Schema::create('cb_modules', function(Blueprint $table) {
16 16
             $table->increments("id");
17 17
             $table->string('name');
18 18
             $table->string("icon");
Please login to merge, or discard this patch.
src/views/module/form/form_body.blade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 @endforeach
11 11
 
12 12
 <?php
13
-    if(cb()->getCurrentMethod()=="getEdit") {
13
+    if (cb()->getCurrentMethod() == "getEdit") {
14 14
         /** @var $row object */
15 15
         columnSingleton()->valueAssignment($row);
16 16
     }
Please login to merge, or discard this patch.
src/controllers/DeveloperUsersController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/controllers/DeveloperMenusController.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -24,22 +24,22 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/controllers/DeveloperRolesController.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -25,12 +25,12 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/controllers/scaffolding/traits/ColumnsRegister.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
         $data = new TextModel();
54 54
         $data = $this->setDefaultModelValue($data);
55 55
         $data->setLabel($label);
56
-        $data->setName($this->name($label,$name));
57
-        $data->setField($field_to_save?:$this->name($label, $name));
56
+        $data->setName($this->name($label, $name));
57
+        $data->setField($field_to_save ?: $this->name($label, $name));
58 58
         $data->setType("text");
59 59
 
60 60
         columnSingleton()->setColumn($this->index, $data);
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
         $data = new CheckboxModel();
70 70
         $data = $this->setDefaultModelValue($data);
71 71
         $data->setLabel($label);
72
-        $data->setName($this->name($label,$name));
73
-        $data->setField($field_to_save?:$this->name($label, $name));
72
+        $data->setName($this->name($label, $name));
73
+        $data->setField($field_to_save ?: $this->name($label, $name));
74 74
         $data->setType("checkbox");
75 75
 
76 76
         columnSingleton()->setColumn($this->index, $data);
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
         $data = new PasswordModel();
86 86
         $data = $this->setDefaultModelValue($data);
87 87
         $data->setLabel($label);
88
-        $data->setName($this->name($label,$name));
89
-        $data->setField($field_to_save?:$this->name($label, $name));
88
+        $data->setName($this->name($label, $name));
89
+        $data->setField($field_to_save ?: $this->name($label, $name));
90 90
         $data->setType("password");
91 91
         $data->setShowDetail(false);
92 92
         $data->setShowIndex(false);
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
         $data = new ImageModel();
104 104
         $data = $this->setDefaultModelValue($data);
105 105
         $data->setLabel($label);
106
-        $data->setName($this->name($label,$name));
107
-        $data->setField($field_to_save?:$this->name($label, $name));
106
+        $data->setName($this->name($label, $name));
107
+        $data->setField($field_to_save ?: $this->name($label, $name));
108 108
         $data->setType("image");
109 109
 
110 110
         columnSingleton()->setColumn($this->index, $data);
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
         $data = new TextAreaModel();
120 120
         $data = $this->setDefaultModelValue($data);
121 121
         $data->setLabel($label);
122
-        $data->setName($this->name($label,$name));
123
-        $data->setField($field_to_save?:$this->name($label, $name));
122
+        $data->setName($this->name($label, $name));
123
+        $data->setField($field_to_save ?: $this->name($label, $name));
124 124
         $data->setType("text_area");
125 125
 
126 126
         columnSingleton()->setColumn($this->index, $data);
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
         $data = new SelectModel();
136 136
         $data = $this->setDefaultModelValue($data);
137 137
         $data->setLabel($label);
138
-        $data->setName($this->name($label,$name));
139
-        $data->setField($field_to_save?:$this->name($label, $name));
138
+        $data->setName($this->name($label, $name));
139
+        $data->setField($field_to_save ?: $this->name($label, $name));
140 140
         $data->setType("select");
141 141
 
142 142
         columnSingleton()->setColumn($this->index, $data);
@@ -152,8 +152,8 @@  discard block
 block discarded – undo
152 152
         $data = new CustomModel();
153 153
         $data = $this->setDefaultModelValue($data);
154 154
         $data->setLabel($label);
155
-        $data->setName($this->name($label,$name));
156
-        $data->setField($field_to_save?:$this->name($label, $name));
155
+        $data->setName($this->name($label, $name));
156
+        $data->setField($field_to_save ?: $this->name($label, $name));
157 157
         $data->setType("custom");
158 158
 
159 159
         columnSingleton()->setColumn($this->index, $data);
@@ -168,8 +168,8 @@  discard block
 block discarded – undo
168 168
         $data = new DateModel();
169 169
         $data = $this->setDefaultModelValue($data);
170 170
         $data->setLabel($label);
171
-        $data->setName($this->name($label,$name));
172
-        $data->setField($field_to_save?:$this->name($label, $name));
171
+        $data->setName($this->name($label, $name));
172
+        $data->setField($field_to_save ?: $this->name($label, $name));
173 173
         $data->setType("date");
174 174
 
175 175
         columnSingleton()->setColumn($this->index, $data);
@@ -184,8 +184,8 @@  discard block
 block discarded – undo
184 184
         $data = new DatetimeModel();
185 185
         $data = $this->setDefaultModelValue($data);
186 186
         $data->setLabel($label);
187
-        $data->setName($this->name($label,$name));
188
-        $data->setField($field_to_save?:$this->name($label, $name));
187
+        $data->setName($this->name($label, $name));
188
+        $data->setField($field_to_save ?: $this->name($label, $name));
189 189
         $data->setType("datetime");
190 190
 
191 191
         columnSingleton()->setColumn($this->index, $data);
@@ -200,8 +200,8 @@  discard block
 block discarded – undo
200 200
         $data = new EmailModel();
201 201
         $data = $this->setDefaultModelValue($data);
202 202
         $data->setLabel($label);
203
-        $data->setName($this->name($label,$name));
204
-        $data->setField($field_to_save?:$this->name($label, $name));
203
+        $data->setName($this->name($label, $name));
204
+        $data->setField($field_to_save ?: $this->name($label, $name));
205 205
         $data->setType("email");
206 206
 
207 207
         columnSingleton()->setColumn($this->index, $data);
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
216 216
         $data = new FileModel();
217 217
         $data = $this->setDefaultModelValue($data);
218 218
         $data->setLabel($label);
219
-        $data->setName($this->name($label,$name));
220
-        $data->setField($field_to_save?:$this->name($label, $name));
219
+        $data->setName($this->name($label, $name));
220
+        $data->setField($field_to_save ?: $this->name($label, $name));
221 221
         $data->setType("file");
222 222
 
223 223
         columnSingleton()->setColumn($this->index, $data);
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
         $data = new HiddenModel();
234 234
         $data = $this->setDefaultModelValue($data);
235 235
         $data->setLabel($label);
236
-        $data->setName($this->name($label,$name));
237
-        $data->setField($field_to_save?:$this->name($label, $name));
236
+        $data->setName($this->name($label, $name));
237
+        $data->setField($field_to_save ?: $this->name($label, $name));
238 238
         $data->setType("hidden");
239 239
 
240 240
         columnSingleton()->setColumn($this->index, $data);
@@ -249,8 +249,8 @@  discard block
 block discarded – undo
249 249
         $data = new NumberModel();
250 250
         $data = $this->setDefaultModelValue($data);
251 251
         $data->setLabel($label);
252
-        $data->setName($this->name($label,$name));
253
-        $data->setField($field_to_save?:$this->name($label, $name));
252
+        $data->setName($this->name($label, $name));
253
+        $data->setField($field_to_save ?: $this->name($label, $name));
254 254
         $data->setType("number");
255 255
 
256 256
         columnSingleton()->setColumn($this->index, $data);
@@ -265,8 +265,8 @@  discard block
 block discarded – undo
265 265
         $data = new RadioModel();
266 266
         $data = $this->setDefaultModelValue($data);
267 267
         $data->setLabel($label);
268
-        $data->setName($this->name($label,$name));
269
-        $data->setField($field_to_save?:$this->name($label, $name));
268
+        $data->setName($this->name($label, $name));
269
+        $data->setField($field_to_save ?: $this->name($label, $name));
270 270
         $data->setType("radio");
271 271
 
272 272
         columnSingleton()->setColumn($this->index, $data);
@@ -281,8 +281,8 @@  discard block
 block discarded – undo
281 281
         $data = new WysiwygModel();
282 282
         $data = $this->setDefaultModelValue($data);
283 283
         $data->setLabel($label);
284
-        $data->setName($this->name($label,$name));
285
-        $data->setField($field_to_save?:$this->name($label, $name));
284
+        $data->setName($this->name($label, $name));
285
+        $data->setField($field_to_save ?: $this->name($label, $name));
286 286
         $data->setType("wysiwyg");
287 287
 
288 288
         columnSingleton()->setColumn($this->index, $data);
Please login to merge, or discard this patch.
src/controllers/scaffolding/traits/ColumnsBasic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 
19 19
     private function name($label, $name = null)
20 20
     {
21
-        return (!$name)?strtolower(slug($label,"_")):$name;
21
+        return (!$name) ?strtolower(slug($label, "_")) : $name;
22 22
     }
23 23
 
24 24
     /**
Please login to merge, or discard this patch.