@@ -2,18 +2,18 @@ |
||
2 | 2 | |
3 | 3 | class Log |
4 | 4 | { |
5 | - public function saveLog($action, $item_name, $item_type, $item_id, $model = false) |
|
6 | - { |
|
7 | - if (\Core::logs() && $item_name !== 'Log') |
|
8 | - { |
|
9 | - $item_name = $item_name; |
|
10 | - \Core::logs()->save([ |
|
11 | - 'action' => $action, |
|
12 | - 'item_name' => $item_name, |
|
13 | - 'item_type' => $item_type, |
|
14 | - 'item_id' => $item_id, |
|
15 | - 'user_id' => \JWTAuth::parseToken()->authenticate()->id, |
|
16 | - ], false, false); |
|
17 | - } |
|
18 | - } |
|
5 | + public function saveLog($action, $item_name, $item_type, $item_id, $model = false) |
|
6 | + { |
|
7 | + if (\Core::logs() && $item_name !== 'Log') |
|
8 | + { |
|
9 | + $item_name = $item_name; |
|
10 | + \Core::logs()->save([ |
|
11 | + 'action' => $action, |
|
12 | + 'item_name' => $item_name, |
|
13 | + 'item_type' => $item_type, |
|
14 | + 'item_id' => $item_id, |
|
15 | + 'user_id' => \JWTAuth::parseToken()->authenticate()->id, |
|
16 | + ], false, false); |
|
17 | + } |
|
18 | + } |
|
19 | 19 | } |
20 | 20 | \ No newline at end of file |
@@ -12,191 +12,191 @@ discard block |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - /** |
|
16 | - * Delete previous permissions. |
|
17 | - */ |
|
15 | + /** |
|
16 | + * Delete previous permissions. |
|
17 | + */ |
|
18 | 18 | DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->delete(); |
19 | 19 | |
20 | 20 | /** |
21 | - * Insert the permissions related to this module. |
|
22 | - */ |
|
23 | - DB::table('permissions')->insert( |
|
24 | - [ |
|
25 | - /** |
|
26 | - * Users model permissions. |
|
27 | - */ |
|
28 | - [ |
|
29 | - 'name' => 'save', |
|
30 | - 'model' => 'users', |
|
31 | - 'created_at' => \DB::raw('NOW()'), |
|
32 | - 'updated_at' => \DB::raw('NOW()') |
|
33 | - ], |
|
34 | - [ |
|
35 | - 'name' => 'delete', |
|
36 | - 'model' => 'users', |
|
37 | - 'created_at' => \DB::raw('NOW()'), |
|
38 | - 'updated_at' => \DB::raw('NOW()') |
|
39 | - ], |
|
40 | - [ |
|
41 | - 'name' => 'find', |
|
42 | - 'model' => 'users', |
|
43 | - 'created_at' => \DB::raw('NOW()'), |
|
44 | - 'updated_at' => \DB::raw('NOW()') |
|
45 | - ], |
|
46 | - [ |
|
47 | - 'name' => 'list', |
|
48 | - 'model' => 'users', |
|
49 | - 'created_at' => \DB::raw('NOW()'), |
|
50 | - 'updated_at' => \DB::raw('NOW()') |
|
51 | - ], |
|
52 | - [ |
|
53 | - 'name' => 'search', |
|
54 | - 'model' => 'users', |
|
55 | - 'created_at' => \DB::raw('NOW()'), |
|
56 | - 'updated_at' => \DB::raw('NOW()') |
|
57 | - ], |
|
58 | - [ |
|
59 | - 'name' => 'findby', |
|
60 | - 'model' => 'users', |
|
61 | - 'created_at' => \DB::raw('NOW()'), |
|
62 | - 'updated_at' => \DB::raw('NOW()') |
|
63 | - ], |
|
64 | - [ |
|
65 | - 'name' => 'first', |
|
66 | - 'model' => 'users', |
|
67 | - 'created_at' => \DB::raw('NOW()'), |
|
68 | - 'updated_at' => \DB::raw('NOW()') |
|
69 | - ], |
|
70 | - [ |
|
71 | - 'name' => 'paginate', |
|
72 | - 'model' => 'users', |
|
73 | - 'created_at' => \DB::raw('NOW()'), |
|
74 | - 'updated_at' => \DB::raw('NOW()') |
|
75 | - ], |
|
76 | - [ |
|
77 | - 'name' => 'paginateby', |
|
78 | - 'model' => 'users', |
|
79 | - 'created_at' => \DB::raw('NOW()'), |
|
80 | - 'updated_at' => \DB::raw('NOW()') |
|
81 | - ], |
|
82 | - [ |
|
83 | - 'name' => 'assigngroups', |
|
84 | - 'model' => 'users', |
|
85 | - 'created_at' => \DB::raw('NOW()'), |
|
86 | - 'updated_at' => \DB::raw('NOW()') |
|
87 | - ], |
|
21 | + * Insert the permissions related to this module. |
|
22 | + */ |
|
23 | + DB::table('permissions')->insert( |
|
24 | + [ |
|
25 | + /** |
|
26 | + * Users model permissions. |
|
27 | + */ |
|
28 | + [ |
|
29 | + 'name' => 'save', |
|
30 | + 'model' => 'users', |
|
31 | + 'created_at' => \DB::raw('NOW()'), |
|
32 | + 'updated_at' => \DB::raw('NOW()') |
|
33 | + ], |
|
34 | + [ |
|
35 | + 'name' => 'delete', |
|
36 | + 'model' => 'users', |
|
37 | + 'created_at' => \DB::raw('NOW()'), |
|
38 | + 'updated_at' => \DB::raw('NOW()') |
|
39 | + ], |
|
40 | + [ |
|
41 | + 'name' => 'find', |
|
42 | + 'model' => 'users', |
|
43 | + 'created_at' => \DB::raw('NOW()'), |
|
44 | + 'updated_at' => \DB::raw('NOW()') |
|
45 | + ], |
|
46 | + [ |
|
47 | + 'name' => 'list', |
|
48 | + 'model' => 'users', |
|
49 | + 'created_at' => \DB::raw('NOW()'), |
|
50 | + 'updated_at' => \DB::raw('NOW()') |
|
51 | + ], |
|
52 | + [ |
|
53 | + 'name' => 'search', |
|
54 | + 'model' => 'users', |
|
55 | + 'created_at' => \DB::raw('NOW()'), |
|
56 | + 'updated_at' => \DB::raw('NOW()') |
|
57 | + ], |
|
58 | + [ |
|
59 | + 'name' => 'findby', |
|
60 | + 'model' => 'users', |
|
61 | + 'created_at' => \DB::raw('NOW()'), |
|
62 | + 'updated_at' => \DB::raw('NOW()') |
|
63 | + ], |
|
64 | + [ |
|
65 | + 'name' => 'first', |
|
66 | + 'model' => 'users', |
|
67 | + 'created_at' => \DB::raw('NOW()'), |
|
68 | + 'updated_at' => \DB::raw('NOW()') |
|
69 | + ], |
|
70 | + [ |
|
71 | + 'name' => 'paginate', |
|
72 | + 'model' => 'users', |
|
73 | + 'created_at' => \DB::raw('NOW()'), |
|
74 | + 'updated_at' => \DB::raw('NOW()') |
|
75 | + ], |
|
76 | + [ |
|
77 | + 'name' => 'paginateby', |
|
78 | + 'model' => 'users', |
|
79 | + 'created_at' => \DB::raw('NOW()'), |
|
80 | + 'updated_at' => \DB::raw('NOW()') |
|
81 | + ], |
|
82 | + [ |
|
83 | + 'name' => 'assigngroups', |
|
84 | + 'model' => 'users', |
|
85 | + 'created_at' => \DB::raw('NOW()'), |
|
86 | + 'updated_at' => \DB::raw('NOW()') |
|
87 | + ], |
|
88 | 88 | |
89 | - /** |
|
90 | - * Permissions model permissions. |
|
91 | - */ |
|
92 | - [ |
|
93 | - 'name' => 'find', |
|
94 | - 'model' => 'permissions', |
|
95 | - 'created_at' => \DB::raw('NOW()'), |
|
96 | - 'updated_at' => \DB::raw('NOW()') |
|
97 | - ], |
|
98 | - [ |
|
99 | - 'name' => 'search', |
|
100 | - 'model' => 'permissions', |
|
101 | - 'created_at' => \DB::raw('NOW()'), |
|
102 | - 'updated_at' => \DB::raw('NOW()') |
|
103 | - ], |
|
104 | - [ |
|
105 | - 'name' => 'list', |
|
106 | - 'model' => 'permissions', |
|
107 | - 'created_at' => \DB::raw('NOW()'), |
|
108 | - 'updated_at' => \DB::raw('NOW()') |
|
109 | - ], |
|
110 | - [ |
|
111 | - 'name' => 'findby', |
|
112 | - 'model' => 'permissions', |
|
113 | - 'created_at' => \DB::raw('NOW()'), |
|
114 | - 'updated_at' => \DB::raw('NOW()') |
|
115 | - ], |
|
116 | - [ |
|
117 | - 'name' => 'first', |
|
118 | - 'model' => 'permissions', |
|
119 | - 'created_at' => \DB::raw('NOW()'), |
|
120 | - 'updated_at' => \DB::raw('NOW()') |
|
121 | - ], |
|
122 | - [ |
|
123 | - 'name' => 'paginate', |
|
124 | - 'model' => 'permissions', |
|
125 | - 'created_at' => \DB::raw('NOW()'), |
|
126 | - 'updated_at' => \DB::raw('NOW()') |
|
127 | - ], |
|
128 | - [ |
|
129 | - 'name' => 'paginateby', |
|
130 | - 'model' => 'permissions', |
|
131 | - 'created_at' => \DB::raw('NOW()'), |
|
132 | - 'updated_at' => \DB::raw('NOW()') |
|
133 | - ], |
|
89 | + /** |
|
90 | + * Permissions model permissions. |
|
91 | + */ |
|
92 | + [ |
|
93 | + 'name' => 'find', |
|
94 | + 'model' => 'permissions', |
|
95 | + 'created_at' => \DB::raw('NOW()'), |
|
96 | + 'updated_at' => \DB::raw('NOW()') |
|
97 | + ], |
|
98 | + [ |
|
99 | + 'name' => 'search', |
|
100 | + 'model' => 'permissions', |
|
101 | + 'created_at' => \DB::raw('NOW()'), |
|
102 | + 'updated_at' => \DB::raw('NOW()') |
|
103 | + ], |
|
104 | + [ |
|
105 | + 'name' => 'list', |
|
106 | + 'model' => 'permissions', |
|
107 | + 'created_at' => \DB::raw('NOW()'), |
|
108 | + 'updated_at' => \DB::raw('NOW()') |
|
109 | + ], |
|
110 | + [ |
|
111 | + 'name' => 'findby', |
|
112 | + 'model' => 'permissions', |
|
113 | + 'created_at' => \DB::raw('NOW()'), |
|
114 | + 'updated_at' => \DB::raw('NOW()') |
|
115 | + ], |
|
116 | + [ |
|
117 | + 'name' => 'first', |
|
118 | + 'model' => 'permissions', |
|
119 | + 'created_at' => \DB::raw('NOW()'), |
|
120 | + 'updated_at' => \DB::raw('NOW()') |
|
121 | + ], |
|
122 | + [ |
|
123 | + 'name' => 'paginate', |
|
124 | + 'model' => 'permissions', |
|
125 | + 'created_at' => \DB::raw('NOW()'), |
|
126 | + 'updated_at' => \DB::raw('NOW()') |
|
127 | + ], |
|
128 | + [ |
|
129 | + 'name' => 'paginateby', |
|
130 | + 'model' => 'permissions', |
|
131 | + 'created_at' => \DB::raw('NOW()'), |
|
132 | + 'updated_at' => \DB::raw('NOW()') |
|
133 | + ], |
|
134 | 134 | |
135 | - /** |
|
136 | - * Groups model permissions. |
|
137 | - */ |
|
138 | - [ |
|
139 | - 'name' => 'save', |
|
140 | - 'model' => 'groups', |
|
141 | - 'created_at' => \DB::raw('NOW()'), |
|
142 | - 'updated_at' => \DB::raw('NOW()') |
|
143 | - ], |
|
144 | - [ |
|
145 | - 'name' => 'delete', |
|
146 | - 'model' => 'groups', |
|
147 | - 'created_at' => \DB::raw('NOW()'), |
|
148 | - 'updated_at' => \DB::raw('NOW()') |
|
149 | - ], |
|
150 | - [ |
|
151 | - 'name' => 'find', |
|
152 | - 'model' => 'groups', |
|
153 | - 'created_at' => \DB::raw('NOW()'), |
|
154 | - 'updated_at' => \DB::raw('NOW()') |
|
155 | - ], |
|
156 | - [ |
|
157 | - 'name' => 'search', |
|
158 | - 'model' => 'groups', |
|
159 | - 'created_at' => \DB::raw('NOW()'), |
|
160 | - 'updated_at' => \DB::raw('NOW()') |
|
161 | - ], |
|
162 | - [ |
|
163 | - 'name' => 'list', |
|
164 | - 'model' => 'groups', |
|
165 | - 'created_at' => \DB::raw('NOW()'), |
|
166 | - 'updated_at' => \DB::raw('NOW()') |
|
167 | - ], |
|
168 | - [ |
|
169 | - 'name' => 'findby', |
|
170 | - 'model' => 'groups', |
|
171 | - 'created_at' => \DB::raw('NOW()'), |
|
172 | - 'updated_at' => \DB::raw('NOW()') |
|
173 | - ], |
|
174 | - [ |
|
175 | - 'name' => 'first', |
|
176 | - 'model' => 'groups', |
|
177 | - 'created_at' => \DB::raw('NOW()'), |
|
178 | - 'updated_at' => \DB::raw('NOW()') |
|
179 | - ], |
|
180 | - [ |
|
181 | - 'name' => 'paginate', |
|
182 | - 'model' => 'groups', |
|
183 | - 'created_at' => \DB::raw('NOW()'), |
|
184 | - 'updated_at' => \DB::raw('NOW()') |
|
185 | - ], |
|
186 | - [ |
|
187 | - 'name' => 'paginateby', |
|
188 | - 'model' => 'groups', |
|
189 | - 'created_at' => \DB::raw('NOW()'), |
|
190 | - 'updated_at' => \DB::raw('NOW()') |
|
191 | - ], |
|
192 | - [ |
|
193 | - 'name' => 'assignpermissions', |
|
194 | - 'model' => 'groups', |
|
195 | - 'created_at' => \DB::raw('NOW()'), |
|
196 | - 'updated_at' => \DB::raw('NOW()') |
|
197 | - ], |
|
198 | - ] |
|
199 | - ); |
|
135 | + /** |
|
136 | + * Groups model permissions. |
|
137 | + */ |
|
138 | + [ |
|
139 | + 'name' => 'save', |
|
140 | + 'model' => 'groups', |
|
141 | + 'created_at' => \DB::raw('NOW()'), |
|
142 | + 'updated_at' => \DB::raw('NOW()') |
|
143 | + ], |
|
144 | + [ |
|
145 | + 'name' => 'delete', |
|
146 | + 'model' => 'groups', |
|
147 | + 'created_at' => \DB::raw('NOW()'), |
|
148 | + 'updated_at' => \DB::raw('NOW()') |
|
149 | + ], |
|
150 | + [ |
|
151 | + 'name' => 'find', |
|
152 | + 'model' => 'groups', |
|
153 | + 'created_at' => \DB::raw('NOW()'), |
|
154 | + 'updated_at' => \DB::raw('NOW()') |
|
155 | + ], |
|
156 | + [ |
|
157 | + 'name' => 'search', |
|
158 | + 'model' => 'groups', |
|
159 | + 'created_at' => \DB::raw('NOW()'), |
|
160 | + 'updated_at' => \DB::raw('NOW()') |
|
161 | + ], |
|
162 | + [ |
|
163 | + 'name' => 'list', |
|
164 | + 'model' => 'groups', |
|
165 | + 'created_at' => \DB::raw('NOW()'), |
|
166 | + 'updated_at' => \DB::raw('NOW()') |
|
167 | + ], |
|
168 | + [ |
|
169 | + 'name' => 'findby', |
|
170 | + 'model' => 'groups', |
|
171 | + 'created_at' => \DB::raw('NOW()'), |
|
172 | + 'updated_at' => \DB::raw('NOW()') |
|
173 | + ], |
|
174 | + [ |
|
175 | + 'name' => 'first', |
|
176 | + 'model' => 'groups', |
|
177 | + 'created_at' => \DB::raw('NOW()'), |
|
178 | + 'updated_at' => \DB::raw('NOW()') |
|
179 | + ], |
|
180 | + [ |
|
181 | + 'name' => 'paginate', |
|
182 | + 'model' => 'groups', |
|
183 | + 'created_at' => \DB::raw('NOW()'), |
|
184 | + 'updated_at' => \DB::raw('NOW()') |
|
185 | + ], |
|
186 | + [ |
|
187 | + 'name' => 'paginateby', |
|
188 | + 'model' => 'groups', |
|
189 | + 'created_at' => \DB::raw('NOW()'), |
|
190 | + 'updated_at' => \DB::raw('NOW()') |
|
191 | + ], |
|
192 | + [ |
|
193 | + 'name' => 'assignpermissions', |
|
194 | + 'model' => 'groups', |
|
195 | + 'created_at' => \DB::raw('NOW()'), |
|
196 | + 'updated_at' => \DB::raw('NOW()') |
|
197 | + ], |
|
198 | + ] |
|
199 | + ); |
|
200 | 200 | |
201 | 201 | /** |
202 | 202 | * Delete previous data. |
@@ -224,29 +224,29 @@ discard block |
||
224 | 224 | * Create Default users. |
225 | 225 | */ |
226 | 226 | $adminUserId = DB::table('users')->insertGetId( |
227 | - [ |
|
227 | + [ |
|
228 | 228 | 'email' => '[email protected]', |
229 | 229 | 'password' => bcrypt('123456'), |
230 | 230 | 'created_at' => \DB::raw('NOW()'), |
231 | 231 | 'updated_at' => \DB::raw('NOW()') |
232 | 232 | ] |
233 | - ); |
|
233 | + ); |
|
234 | 234 | |
235 | 235 | /** |
236 | 236 | * Assign users to groups. |
237 | 237 | */ |
238 | 238 | DB::table('users_groups')->insert( |
239 | - [ |
|
240 | - [ |
|
239 | + [ |
|
240 | + [ |
|
241 | 241 | 'user_id' => $adminUserId, |
242 | 242 | 'group_id' => $adminGroupId, |
243 | 243 | 'created_at' => \DB::raw('NOW()'), |
244 | 244 | 'updated_at' => \DB::raw('NOW()') |
245 | - ] |
|
246 | - ] |
|
247 | - ); |
|
245 | + ] |
|
246 | + ] |
|
247 | + ); |
|
248 | 248 | |
249 | - /** |
|
249 | + /** |
|
250 | 250 | * Assign the permissions to the admin group. |
251 | 251 | */ |
252 | 252 | $permissionIds = DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->select('id')->lists('id'); |