Skip to content

Commit efef356

Browse files
DaneEverittDaneEveritt
committed
Assorted model code updates.
1 parent ba175e6 commit efef356

5 files changed

Lines changed: 31 additions & 83 deletions

File tree

‎app/Http/Controllers/Admin/NodesController.php‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,8 @@ public function postNew(Request $request)
112112
public function getView(Request $request, $id)
113113
{
114114
$node = Models\Node::with(
115-
'servers.user',
116-
'servers.service',
117-
'servers.allocations',
118-
'location'
115+
'servers.user', 'servers.service',
116+
'servers.allocations', 'location'
119117
)->findOrFail($id);
120118
$node->setRelation('allocations', $node->allocations()->paginate(40));
121119

@@ -131,20 +129,12 @@ public function postView(Request $request, $id)
131129
try {
132130
$node = new NodeRepository;
133131
$node->update($id, $request->only([
134-
'name',
135-
'location',
136-
'public',
137-
'fqdn',
138-
'scheme',
139-
'memory',
140-
'memory_overallocate',
141-
'disk',
142-
'disk_overallocate',
143-
'upload_size',
144-
'daemonBase',
145-
'daemonSFTP',
146-
'daemonListen',
147-
'reset_secret',
132+
'name', 'location', 'public',
133+
'fqdn', 'scheme', 'memory',
134+
'memory_overallocate', 'disk',
135+
'disk_overallocate', 'upload_size',
136+
'daemonBase', 'daemonSFTP',
137+
'daemonListen', 'reset_secret',
148138
]));
149139
Alert::success('Successfully update this node\'s information. If you changed any daemon settings you will need to restart it now.')->flash();
150140

‎app/Http/Controllers/Admin/PackController.php‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,8 @@ public function create(Request $request)
7373
try {
7474
$repo = new Pack;
7575
$pack = $repo->create($request->only([
76-
'name',
77-
'version',
78-
'description',
79-
'option',
80-
'selectable',
81-
'visible',
76+
'name', 'version', 'description',
77+
'option', 'selectable', 'visible',
8278
'file_upload',
8379
]));
8480
Alert::success('Successfully created new service!')->flash();
@@ -128,12 +124,8 @@ public function update(Request $request, $id)
128124
try {
129125
$repo = new Pack;
130126
$repo->update($id, $request->only([
131-
'name',
132-
'version',
133-
'description',
134-
'option',
135-
'selectable',
136-
'visible',
127+
'name', 'version', 'description',
128+
'option', 'selectable', 'visible',
137129
]));
138130
Alert::success('Service pack has been successfully updated.')->flash();
139131
} catch (DisplayValidationException $ex) {

‎app/Http/Controllers/Admin/ServersController.php‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,9 @@ public function postUpdateServerUpdateBuild(Request $request, $id)
279279
try {
280280
$server = new ServerRepository;
281281
$server->changeBuild($id, $request->only([
282-
'default',
283-
'add_additional',
284-
'remove_additional',
285-
'memory',
286-
'swap',
287-
'io',
288-
'cpu',
282+
'default', 'add_additional',
283+
'remove_additional', 'memory',
284+
'swap', 'io', 'cpu',
289285
]));
290286
Alert::success('Server details were successfully updated.')->flash();
291287
} catch (DisplayValidationException $ex) {
@@ -377,9 +373,7 @@ public function postDatabase(Request $request, $id)
377373
try {
378374
$repo = new DatabaseRepository;
379375
$repo->create($id, $request->only([
380-
'db_server',
381-
'database',
382-
'remote',
376+
'db_server', 'database', 'remote',
383377
]));
384378
Alert::success('Added new database to this server.')->flash();
385379
} catch (DisplayValidationException $ex) {

‎app/Http/Controllers/Admin/ServiceController.php‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,8 @@ public function postNew(Request $request)
5959
try {
6060
$repo = new ServiceRepository\Service;
6161
$service = $repo->create($request->only([
62-
'name',
63-
'description',
64-
'file',
65-
'executable',
66-
'startup',
62+
'name', 'description', 'file',
63+
'executable', 'startup',
6764
]));
6865
Alert::success('Successfully created new service!')->flash();
6966

@@ -92,11 +89,8 @@ public function postService(Request $request, $service)
9289
try {
9390
$repo = new ServiceRepository\Service;
9491
$repo->update($service, $request->only([
95-
'name',
96-
'description',
97-
'file',
98-
'executable',
99-
'startup',
92+
'name', 'description', 'file',
93+
'executable', 'startup',
10094
]));
10195
Alert::success('Successfully updated this service.')->flash();
10296
} catch (DisplayValidationException $ex) {
@@ -134,22 +128,16 @@ public function getOption(Request $request, $service, $option)
134128
$option = Models\ServiceOptions::with('service', 'variables')->findOrFail($option);
135129
$option->setRelation('servers', $option->servers()->with('user')->paginate(25));
136130

137-
return view('admin.services.options.view', [
138-
'option' => $option,
139-
]);
131+
return view('admin.services.options.view', ['option' => $option]);
140132
}
141133

142134
public function postOption(Request $request, $service, $option)
143135
{
144136
try {
145137
$repo = new ServiceRepository\Option;
146138
$repo->update($option, $request->only([
147-
'name',
148-
'description',
149-
'tag',
150-
'executable',
151-
'docker_image',
152-
'startup',
139+
'name', 'description', 'tag',
140+
'executable', 'docker_image', 'startup',
153141
]));
154142
Alert::success('Option settings successfully updated.')->flash();
155143
} catch (DisplayValidationException $ex) {
@@ -227,14 +215,9 @@ public function postNewVariable(Request $request, $service, $option)
227215
try {
228216
$repo = new ServiceRepository\Variable;
229217
$repo->create($option, $request->only([
230-
'name',
231-
'description',
232-
'env_variable',
233-
'default_value',
234-
'user_viewable',
235-
'user_editable',
236-
'required',
237-
'regex',
218+
'name', 'description', 'env_variable',
219+
'default_value', 'user_viewable',
220+
'user_editable', 'required', 'regex',
238221
]));
239222
Alert::success('Successfully added new variable to this option.')->flash();
240223

@@ -311,10 +294,7 @@ public function postConfiguration(Request $request, $serviceId)
311294
{
312295
try {
313296
$repo = new ServiceRepository\Service;
314-
$repo->updateFile($serviceId, $request->only([
315-
'file',
316-
'contents',
317-
]));
297+
$repo->updateFile($serviceId, $request->only(['file', 'contents']));
318298

319299
return response('', 204);
320300
} catch (DisplayException $ex) {

‎app/Http/Controllers/Admin/UserController.php‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,8 @@ public function postNew(Request $request)
8888
try {
8989
$user = new UserRepository;
9090
$userid = $user->create($request->only([
91-
'email',
92-
'password',
93-
'name_first',
94-
'name_last',
95-
'username',
96-
'root_admin',
91+
'email', 'password', 'name_first',
92+
'name_last', 'username', 'root_admin',
9793
]));
9894
Alert::success('Account has been successfully created.')->flash();
9995

@@ -113,12 +109,8 @@ public function updateUser(Request $request, $user)
113109
try {
114110
$repo = new UserRepository;
115111
$repo->update($user, $request->only([
116-
'email',
117-
'password',
118-
'name_first',
119-
'name_last',
120-
'username',
121-
'root_admin',
112+
'email', 'password', 'name_first',
113+
'name_last', 'username', 'root_admin',
122114
]));
123115
Alert::success('User account was successfully updated.')->flash();
124116
} catch (DisplayValidationException $ex) {

0 commit comments

Comments
 (0)