Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #516 from turbo124/master

Browse Source 
shift SITE_URL into user_accounts key path
This commit is contained in:
David Bomba 2015-11-10 20:34:56 +11:00
commit ec8389f320
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AccountApiController.php
View File

@ -53,8 +53,7 @@ class AccountApiController extends BaseAPIController
$data = $this->createCollection($users, new UserAccountTransformer($user->account, $request->token_name)); $data = $this->createCollection($users, new UserAccountTransformer($user->account, $request->token_name));
$response = [ $response = [
'user_accounts' => $data, 'user_accounts' => $data
'default_url' => SITE_URL
]; ];
return $this->response($response); return $this->response($response);

1
app/Ninja/Transformers/UserAccountTransformer.php
View File

@ -32,6 +32,7 @@ class UserAccountTransformer extends EntityTransformer
'account_key' => $user->account->account_key, 'account_key' => $user->account->account_key,
'name' => $user->account->present()->name, 'name' => $user->account->present()->name,
'token' => $user->account->getToken($this->tokenName), 'token' => $user->account->getToken($this->tokenName),
'default_url' => SITE_URL
]; ];
} }
} }

25
composer.lock generated
View File

@ -1,10 +1,11 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "fb15622e77287d516219e55ebb01ea3e", "hash": "fb15622e77287d516219e55ebb01ea3e",
"content-hash": "25cba035ae6f43a8c06493812b4e4d4d",
"packages": [ "packages": [
{ {
"name": "agmscode/omnipay-agms", "name": "agmscode/omnipay-agms",
@ -505,7 +506,7 @@
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Chumper/Datatable/zipball/7fa47cb5469f07c620fb69dee94b8e1a96943ee2", "url": "https://api.github.com/repos/Chumper/Datatable/zipball/b44834db3d4e560d4368c1a04248b9e6a422ccff",
"reference": "7fa47cb", "reference": "7fa47cb",
"shasum": "" "shasum": ""
}, },
@ -517,7 +518,7 @@
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "dev-master", "mockery/mockery": "dev-master",
"orchestra/testbench": "2.1.*", "orchestra/testbench": "3.1.*",
"phpunit/phpunit": "3.7.*" "phpunit/phpunit": "3.7.*"
}, },
"type": "library", "type": "library",
@ -546,7 +547,7 @@
"jquery", "jquery",
"laravel" "laravel"
], ],
"time": "2015-04-20 09:21:21" "time": "2015-10-26 01:21:31"
}, },
{ {
"name": "classpreloader/classpreloader", "name": "classpreloader/classpreloader",
@ -5997,12 +5998,12 @@
"target-dir": "Symfony/Component/Console", "target-dir": "Symfony/Component/Console",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Console.git", "url": "https://github.com/symfony/console.git",
"reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359" "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/0e5e18ae09d3f5c06367759be940e9ed3f568359", "url": "https://api.github.com/repos/symfony/console/zipball/0e5e18ae09d3f5c06367759be940e9ed3f568359",
"reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359", "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359",
"shasum": "" "shasum": ""
}, },
@ -6055,12 +6056,12 @@
"target-dir": "Symfony/Component/Debug", "target-dir": "Symfony/Component/Debug",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941" "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/fca5696e0c9787722baa8f2ad6940dfd7a6a6941", "url": "https://api.github.com/repos/symfony/debug/zipball/fca5696e0c9787722baa8f2ad6940dfd7a6a6941",
"reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941", "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941",
"shasum": "" "shasum": ""
}, },
@ -6269,12 +6270,12 @@
"target-dir": "Symfony/Component/HttpFoundation", "target-dir": "Symfony/Component/HttpFoundation",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpFoundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c" "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c",
"reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c",
"shasum": "" "shasum": ""
}, },
@ -6323,12 +6324,12 @@
"target-dir": "Symfony/Component/HttpKernel", "target-dir": "Symfony/Component/HttpKernel",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpKernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322" "reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/a3f0ed713255c0400a2db38b3ed01989ef4b7322", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a3f0ed713255c0400a2db38b3ed01989ef4b7322",
"reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322", "reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322",
"shasum": "" "shasum": ""
}, },