lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
James Brooks
2016-07-29 11:45:45 -04:00
parent 0f029702d4 380048dd53
commit 915ea0d0bd
9 changed files with 72312 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/Dashboard/ApiController.php
View File

@@ -38,13 +38,13 @@ class ApiController extends AbstractApiController
try {
dispatch(new UpdateComponentCommand(
$component,
null,
null,
$component->name,
$component->description,
Binput::get('status'),
null,
null,
null,
null
$component->link,
$component->order,
$component->group_id,
$component->enabled
));
} catch (QueryException $e) {
throw new BadRequestHttpException();
@@ -64,15 +64,17 @@ class ApiController extends AbstractApiController
foreach ($componentData as $order => $componentId) {
try {
$component = Component::find($componentId);
dispatch(new UpdateComponentCommand(
Component::find($componentId),
null,
null,
null,
null,
$component,
$component->name,
$component->description,
$component->status,
$component->link,
$order + 1,
null,
null
$component->group_id,
$component->enabled
));
} catch (QueryException $e) {
throw new BadRequestHttpException();
@@ -92,11 +94,13 @@ class ApiController extends AbstractApiController
$groupData = Binput::get('ids');
foreach ($groupData as $order => $groupId) {
$group = ComponentGroup::find($groupId);
dispatch(new UpdateComponentGroupCommand(
ComponentGroup::find($groupId),
null,
$group,
$group->name,
$order + 1,
null
$group->collapsed
));
}