@@ -56,7 +56,7 @@ |
||
| 56 | 56 | if ($this->input('update') == 'password') { |
| 57 | 57 | $user_id = $this->input('user_id'); |
| 58 | 58 | $rules = ['password' => 'required|min:5|max:255', |
| 59 | - 'password_confirmation' => 'required|same:password', |
|
| 59 | + 'password_confirmation' => 'required|same:password', |
|
| 60 | 60 | ]; |
| 61 | 61 | if (!Auth::user()->isAdmin() || Auth::id() == $user_id) { |
| 62 | 62 | $rules['current_password'] = 'required|password:'.$user_id; |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | */ |
| 74 | 74 | public function show(Request $request, $id) |
| 75 | 75 | { |
| 76 | - $widget = Widgets::find($id); |
|
| 76 | + $widget = Widgets::find($id); |
|
| 77 | 77 | return array('widget' => $widget); |
| 78 | 78 | } |
| 79 | 79 | |
@@ -18,10 +18,10 @@ |
||
| 18 | 18 | * |
| 19 | 19 | * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View |
| 20 | 20 | */ |
| 21 | - public function index(DeviceDataTable $dataTable, $group_id=-1) |
|
| 21 | + public function index(DeviceDataTable $dataTable, $group_id = -1) |
|
| 22 | 22 | { |
| 23 | 23 | $group_name = ""; |
| 24 | - if($group_id >= 0) { |
|
| 24 | + if ($group_id >= 0) { |
|
| 25 | 25 | $dataTable->addScope(new \App\DataTables\Scopes\DeviceGroup($group_id)); |
| 26 | 26 | $group_name = DeviceGroup::find($group_id)->name; |
| 27 | 27 | } |