diff options
| author | mo khan <mo@mokhan.ca> | 2014-02-22 08:52:13 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2014-02-22 08:52:13 -0700 |
| commit | 7947414c935aa6a20a2de068b343df2a0f141384 (patch) | |
| tree | 46fc01930169f48a5debf42092baebb141bd18ba /app/views | |
| parent | 1388b346450b975703b7890eb87505e975713c22 (diff) | |
add status to license and fix broken jbuilder spec.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/v1/company_licenses/index.jbuilder | 6 | ||||
| -rw-r--r-- | app/views/v1/licenses/_license.json.jbuilder | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/v1/company_licenses/index.jbuilder b/app/views/v1/company_licenses/index.jbuilder index db62113..8228f3e 100644 --- a/app/views/v1/company_licenses/index.jbuilder +++ b/app/views/v1/company_licenses/index.jbuilder @@ -1,5 +1,7 @@ -json.array! @licenses do |license| - json.partial! 'v1/licenses/license', license: license +json.licenses do + json.array! @licenses do |license| + json.partial! 'v1/licenses/license', license: license + end end json.partial! 'v1/shared/well_types', well_types: @well_types json.partial! 'v1/shared/license_statuses', license_statuses: @license_statuses diff --git a/app/views/v1/licenses/_license.json.jbuilder b/app/views/v1/licenses/_license.json.jbuilder index 33109d8..c66fb3f 100644 --- a/app/views/v1/licenses/_license.json.jbuilder +++ b/app/views/v1/licenses/_license.json.jbuilder @@ -1,5 +1,5 @@ json.id license.id -json.status license.status +json.status license.status.to_s json.partial! 'v1/licenses/location', location: license.location if license.confidential? json.partial! 'v1/licenses/confidential_well_type', well_type: license.well_type |