kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'apifix' into develop

Browse Source 
* apifix:
  Fix issues with API authentication.

# Conflicts:
#	app/Api/V1/Controllers/BillController.php
#	app/Http/Middleware/HttpBinder.php
#	app/Transformers/AttachmentTransformer.php
#	app/Transformers/BillTransformer.php
#	app/Transformers/NoteTransformer.php
#	routes/api.php
This commit is contained in:
James Cole
2018-02-09 14:57:39 +01:00
parent d4a84ed198 d393c693de
commit d2a8819dd4
6 changed files with 104 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Transformers/BillTransformer.php
View File

@@ -72,7 +72,7 @@ class BillTransformer extends TransformerAbstract
{
$attachments = $bill->attachments()->get();
return $this->collection($attachments, new AttachmentTransformer,'attachment');
return $this->collection($attachments, new AttachmentTransformer, 'attachment');
}
/**
@@ -84,7 +84,7 @@ class BillTransformer extends TransformerAbstract
{
$notes = $bill->notes()->get();
return $this->collection($notes, new NoteTransformer,'note');
return $this->collection($notes, new NoteTransformer, 'note');
}
/**