Skip to content

Commit a490ff8

Browse files
committed
1/3 commit
1 parent 56ec146 commit a490ff8

File tree

9 files changed

+23
-35
lines changed

9 files changed

+23
-35
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5:78163e74-85d7-4de3-9f4e-02009f981d65
1+
1.5:607ae722-dec5-47bf-9b9e-1f8c76f805a8
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1479129228
1+
1480487493
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
78163e74-85d7-4de3-9f4e-02009f981d65
1+
607ae722-dec5-47bf-9b9e-1f8c76f805a8
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f4672dbefaf24e758ac03c3b8ae76f6b
1+
1659c8fad8b34d8dbbb213572eba68fa

.vagrant/machines/default/virtualbox/private_key

Lines changed: 0 additions & 27 deletions
This file was deleted.

.vagrant/machines/default/virtualbox/synced_folders

Lines changed: 0 additions & 1 deletion
This file was deleted.

Homestead.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ folders:
1818
sites:
1919
- map: vms.dev
2020
to: "/home/vagrant/vms/public"
21+
hhvm: true
2122

2223
databases:
2324
- homestead

app/Http/Controllers/Api/V1_0/ProjectController.php

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ public function inviteVolunteer(InviteVolunteerInProjectRequest $request, $proje
185185
$project = Project::find($projectId);
186186
$checked = true;
187187

188+
188189
$volunteers->each(function($volunteer) use ($project, $checked) {
189190
if ($volunteer->inProject($project)) {
190191
$checked = false;
@@ -284,15 +285,29 @@ public function showMembers(ShowProjectRequest $request, $projectId)
284285
return response()->json($result, $status);
285286
}
286287

288+
287289
// add parameters
288-
public function showPMs()
290+
public function showPMs(ShowProjectRequest $request, $projectId)
289291
{
292+
echo "shit~!!!";
290293
$user = $this->jwtService->getUser();
291294
$project = Project::findOrFail($projectId);
292295
// if this is a pm of the project
293296
if ($user->isCreatorOfProject($project)) {
294-
$pms = $project->project_managers()->get();
297+
$pms = $project->managers()->get();
298+
}
299+
else
300+
{
301+
// return error status
295302
}
303+
304+
$manager = TransformerService::getJsonApiManager();
305+
$resource = TransformerService::getResourceCollection($pms,
306+
'App\Transformers\JsonApiManagerTransformer', 'pms');
307+
$result = $manager->createData($resource)->toArray();
308+
$status = 200;
309+
310+
return response()->json($result, $status);
296311
}
297312

298313
protected function isPublic(Project $project)

app/Http/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
'App\Http\Controllers\Api\V1_0\ProjectController@attachVolunteer');
178178
$api->get('projects/{projectId}/members',
179179
'App\Http\Controllers\Api\V1_0\ProjectController@showMembers');
180-
$api->get('projects/{projectId}/members',
180+
$api->get('projects/{projectId}/pm',
181181
'App\Http\Controllers\Api\V1_0\ProjectController@showPMs');
182182

183183
$api->delete('projects/{projectId}/members/{userId}',

0 commit comments

Comments
 (0)