Skip to content

attachable classes #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aryarm merged 9 commits into from
Mar 21, 2019
Merged

attachable classes #137

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd9dc70
create class status column
aryarm Feb 23, 2019
1e1e949
modify ResourceClass seeder to adhere to new class status column
aryarm Feb 23, 2019
0720680
fix small bug in ResourceController attach validation
aryarm Feb 23, 2019
9548b50
send status in tree data
aryarm Feb 23, 2019
0c3bf28
send status in class json request
aryarm Feb 24, 2019
dd7b541
make class_id a required attribute of resource creation
aryarm Feb 24, 2019
32df02b
405 errors should be 403
aryarm Feb 24, 2019
8f28918
make resource-class detachment semi future-proof in case we have more…
aryarm Feb 24, 2019
4b3a796
test the resource controller now that it has a new status attribute
aryarm Feb 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make resource-class detachment semi future-proof in case we have more… 
… status codes
  • Loading branch information
@aryarm
aryarm committed Feb 24, 2019
commit 8f289182f7ffc55dcb992491db34b703a23febd1
6 changes: 3 additions & 3 deletions app/Http/Controllers/ResourceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,12 @@ public function detach(Resource $resource, Request $request){
// so we have to check that this operation is truly allowed first
if ($validated['class'])
{
if (Academic_Class::getRoot()->status == 1) {
$resource->class()->dissociate($validated['class'])->save();
if (Academic_Class::getRoot()->status == 0) {
abort(403, "Detaching this resource will attach it to the root, which is currently not allowed.");
}
else
{
abort(403, "Detaching this resource will attach it to the root, which is currently not allowed.");
$resource->class()->dissociate($validated['class'])->save();
}
}
}
Expand Down