From 4f63c69d6b8d7fe348ccdb7e3e951bfa1e8271ac Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 27 Feb 2014 18:35:30 -0700 Subject: move shared partials into shared folder. --- app/views/v1/company_licenses/index.jbuilder | 2 +- app/views/v1/licenses/_company.jbuilder | 4 ---- app/views/v1/licenses/_confidential_company.jbuilder | 4 ---- app/views/v1/licenses/_confidential_well_type.jbuilder | 5 ----- app/views/v1/licenses/_license.jbuilder | 12 ------------ app/views/v1/licenses/_location.jbuilder | 5 ----- app/views/v1/licenses/_well_type.jbuilder | 5 ----- app/views/v1/licenses/index.jbuilder | 2 +- app/views/v1/licenses/show.jbuilder | 2 +- app/views/v1/shared/_company.jbuilder | 4 ++++ app/views/v1/shared/_confidential_company.jbuilder | 4 ++++ app/views/v1/shared/_confidential_well_type.jbuilder | 5 +++++ app/views/v1/shared/_license.jbuilder | 12 ++++++++++++ app/views/v1/shared/_location.jbuilder | 5 +++++ app/views/v1/shared/_well_type.jbuilder | 5 +++++ 15 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 app/views/v1/licenses/_company.jbuilder delete mode 100644 app/views/v1/licenses/_confidential_company.jbuilder delete mode 100644 app/views/v1/licenses/_confidential_well_type.jbuilder delete mode 100644 app/views/v1/licenses/_license.jbuilder delete mode 100644 app/views/v1/licenses/_location.jbuilder delete mode 100644 app/views/v1/licenses/_well_type.jbuilder create mode 100644 app/views/v1/shared/_company.jbuilder create mode 100644 app/views/v1/shared/_confidential_company.jbuilder create mode 100644 app/views/v1/shared/_confidential_well_type.jbuilder create mode 100644 app/views/v1/shared/_license.jbuilder create mode 100644 app/views/v1/shared/_location.jbuilder create mode 100644 app/views/v1/shared/_well_type.jbuilder 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/_company.jbuilder b/app/views/v1/licenses/_company.jbuilder deleted file mode 100644 index 91a79da..0000000 --- a/app/views/v1/licenses/_company.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.company do - json.name company.name - json.applicant_name applicant.full_name -end diff --git a/app/views/v1/licenses/_confidential_company.jbuilder b/app/views/v1/licenses/_confidential_company.jbuilder deleted file mode 100644 index 312961a..0000000 --- a/app/views/v1/licenses/_confidential_company.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.company do - json.name "CONFIDENTIAL" - json.applicant_name "CONFIDENTIAL" -end diff --git a/app/views/v1/licenses/_confidential_well_type.jbuilder b/app/views/v1/licenses/_confidential_well_type.jbuilder deleted file mode 100644 index 43d8f39..0000000 --- a/app/views/v1/licenses/_confidential_well_type.jbuilder +++ /dev/null @@ -1,5 +0,0 @@ -json.well_type do - json.id "" - json.acronym "" - json.name "CONFIDENTIAL" -end 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/_location.jbuilder b/app/views/v1/licenses/_location.jbuilder deleted file mode 100644 index 5b43756..0000000 --- a/app/views/v1/licenses/_location.jbuilder +++ /dev/null @@ -1,5 +0,0 @@ -json.location do - json.township location.township - json.latitude location.latitude - json.longitude location.longitude -end diff --git a/app/views/v1/licenses/_well_type.jbuilder b/app/views/v1/licenses/_well_type.jbuilder deleted file mode 100644 index dd5176e..0000000 --- a/app/views/v1/licenses/_well_type.jbuilder +++ /dev/null @@ -1,5 +0,0 @@ -json.well_type do - json.id well_type.id - json.acronym well_type.acronym - json.name well_type.name -end 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/shared/_company.jbuilder b/app/views/v1/shared/_company.jbuilder new file mode 100644 index 0000000..91a79da --- /dev/null +++ b/app/views/v1/shared/_company.jbuilder @@ -0,0 +1,4 @@ +json.company do + json.name company.name + json.applicant_name applicant.full_name +end diff --git a/app/views/v1/shared/_confidential_company.jbuilder b/app/views/v1/shared/_confidential_company.jbuilder new file mode 100644 index 0000000..312961a --- /dev/null +++ b/app/views/v1/shared/_confidential_company.jbuilder @@ -0,0 +1,4 @@ +json.company do + json.name "CONFIDENTIAL" + json.applicant_name "CONFIDENTIAL" +end diff --git a/app/views/v1/shared/_confidential_well_type.jbuilder b/app/views/v1/shared/_confidential_well_type.jbuilder new file mode 100644 index 0000000..43d8f39 --- /dev/null +++ b/app/views/v1/shared/_confidential_well_type.jbuilder @@ -0,0 +1,5 @@ +json.well_type do + json.id "" + json.acronym "" + json.name "CONFIDENTIAL" +end 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/shared/_location.jbuilder b/app/views/v1/shared/_location.jbuilder new file mode 100644 index 0000000..5b43756 --- /dev/null +++ b/app/views/v1/shared/_location.jbuilder @@ -0,0 +1,5 @@ +json.location do + json.township location.township + json.latitude location.latitude + json.longitude location.longitude +end diff --git a/app/views/v1/shared/_well_type.jbuilder b/app/views/v1/shared/_well_type.jbuilder new file mode 100644 index 0000000..dd5176e --- /dev/null +++ b/app/views/v1/shared/_well_type.jbuilder @@ -0,0 +1,5 @@ +json.well_type do + json.id well_type.id + json.acronym well_type.acronym + json.name well_type.name +end -- cgit v1.2.3