diff options
| author | mo khan <mo@mokhan.ca> | 2014-02-27 18:35:30 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2014-02-27 18:35:30 -0700 |
| commit | 4f63c69d6b8d7fe348ccdb7e3e951bfa1e8271ac (patch) | |
| tree | 8df0d742800ac7c2371e28b53ed0537b38ef788b | |
| parent | 584662a3bb911d8611299fc2d7fb560ecab682b0 (diff) | |
move shared partials into shared folder.
| -rw-r--r-- | app/views/v1/company_licenses/index.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/v1/licenses/_license.jbuilder | 12 | ||||
| -rw-r--r-- | app/views/v1/licenses/index.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/v1/licenses/show.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/v1/shared/_company.jbuilder (renamed from app/views/v1/licenses/_company.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/v1/shared/_confidential_company.jbuilder (renamed from app/views/v1/licenses/_confidential_company.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/v1/shared/_confidential_well_type.jbuilder (renamed from app/views/v1/licenses/_confidential_well_type.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/v1/shared/_license.jbuilder | 12 | ||||
| -rw-r--r-- | app/views/v1/shared/_location.jbuilder (renamed from app/views/v1/licenses/_location.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/v1/shared/_well_type.jbuilder (renamed from app/views/v1/licenses/_well_type.jbuilder) | 0 |
10 files changed, 15 insertions, 15 deletions
diff --git a/app/views/v1/company_licenses/index.jbuilder b/app/views/v1/company_licenses/index.jbuilder index 8228f3e..0815f1c 100644 --- a/app/views/v1/company_licenses/index.jbuilder +++ b/app/views/v1/company_licenses/index.jbuilder @@ -1,6 +1,6 @@ json.licenses do json.array! @licenses do |license| - json.partial! 'v1/licenses/license', license: license + json.partial! 'v1/shared/license', license: license end end json.partial! 'v1/shared/well_types', well_types: @well_types diff --git a/app/views/v1/licenses/_license.jbuilder b/app/views/v1/licenses/_license.jbuilder deleted file mode 100644 index c66fb3f..0000000 --- a/app/views/v1/licenses/_license.jbuilder +++ /dev/null @@ -1,12 +0,0 @@ -json.id license.id -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 - json.partial! 'v1/licenses/confidential_company' -else - json.partial! 'v1/licenses/well_type', well_type: license.well_type - json.partial! 'v1/licenses/company', company: license.company, applicant: license.applicant -end -json.issued_at license.issued_at.to_s -json.expired_at license.expired_at.to_s diff --git a/app/views/v1/licenses/index.jbuilder b/app/views/v1/licenses/index.jbuilder index 8228f3e..0815f1c 100644 --- a/app/views/v1/licenses/index.jbuilder +++ b/app/views/v1/licenses/index.jbuilder @@ -1,6 +1,6 @@ json.licenses do json.array! @licenses do |license| - json.partial! 'v1/licenses/license', license: license + json.partial! 'v1/shared/license', license: license end end json.partial! 'v1/shared/well_types', well_types: @well_types diff --git a/app/views/v1/licenses/show.jbuilder b/app/views/v1/licenses/show.jbuilder index 7d64d23..c6cc454 100644 --- a/app/views/v1/licenses/show.jbuilder +++ b/app/views/v1/licenses/show.jbuilder @@ -1 +1 @@ -json.partial! 'v1/licenses/license', license: @license +json.partial! 'v1/shared/license', license: @license diff --git a/app/views/v1/licenses/_company.jbuilder b/app/views/v1/shared/_company.jbuilder index 91a79da..91a79da 100644 --- a/app/views/v1/licenses/_company.jbuilder +++ b/app/views/v1/shared/_company.jbuilder diff --git a/app/views/v1/licenses/_confidential_company.jbuilder b/app/views/v1/shared/_confidential_company.jbuilder index 312961a..312961a 100644 --- a/app/views/v1/licenses/_confidential_company.jbuilder +++ b/app/views/v1/shared/_confidential_company.jbuilder diff --git a/app/views/v1/licenses/_confidential_well_type.jbuilder b/app/views/v1/shared/_confidential_well_type.jbuilder index 43d8f39..43d8f39 100644 --- a/app/views/v1/licenses/_confidential_well_type.jbuilder +++ b/app/views/v1/shared/_confidential_well_type.jbuilder diff --git a/app/views/v1/shared/_license.jbuilder b/app/views/v1/shared/_license.jbuilder new file mode 100644 index 0000000..066ed8b --- /dev/null +++ b/app/views/v1/shared/_license.jbuilder @@ -0,0 +1,12 @@ +json.id license.id +json.status license.status.to_s +json.partial! 'v1/shared/location', location: license.location +if license.confidential? + json.partial! 'v1/shared/confidential_well_type', well_type: license.well_type + json.partial! 'v1/shared/confidential_company' +else + json.partial! 'v1/shared/well_type', well_type: license.well_type + json.partial! 'v1/shared/company', company: license.company, applicant: license.applicant +end +json.issued_at license.issued_at.to_s +json.expired_at license.expired_at.to_s diff --git a/app/views/v1/licenses/_location.jbuilder b/app/views/v1/shared/_location.jbuilder index 5b43756..5b43756 100644 --- a/app/views/v1/licenses/_location.jbuilder +++ b/app/views/v1/shared/_location.jbuilder diff --git a/app/views/v1/licenses/_well_type.jbuilder b/app/views/v1/shared/_well_type.jbuilder index dd5176e..dd5176e 100644 --- a/app/views/v1/licenses/_well_type.jbuilder +++ b/app/views/v1/shared/_well_type.jbuilder |
