From cdb9a3466a000ef1c8433d4a06cdc494e7a96a5f Mon Sep 17 00:00:00 2001 From: Torsten Date: Sat, 17 Dec 2022 13:56:42 +0200 Subject: [PATCH] change image data format --- app/models/merged/card.rb | 2 +- app/models/merged/section.rb | 2 +- app/models/merged/view_base.rb | 2 +- test/dummy/merged/cards.yml | 20 ++++++++++---------- test/dummy/merged/sections.yml | 18 +++++++++--------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/models/merged/card.rb b/app/models/merged/card.rb index f8dfc50..4432106 100644 --- a/app/models/merged/card.rb +++ b/app/models/merged/card.rb @@ -5,7 +5,7 @@ module Merged belongs_to :section , class_name: "Merged::Section" fields :id , :index , :section_id - fields :text , :header, :image + fields :text , :header, :image_name def move_up swap_index_with(next_card) diff --git a/app/models/merged/section.rb b/app/models/merged/section.rb index bcdf251..841c06d 100644 --- a/app/models/merged/section.rb +++ b/app/models/merged/section.rb @@ -5,7 +5,7 @@ module Merged fields :id , :page_id , :index fields :template , :card_template - fields :header, :text , :image + fields :header, :text , :image_name def cards Card.where(section_id: id).order(index: :asc) diff --git a/app/models/merged/view_base.rb b/app/models/merged/view_base.rb index bfeb69e..431a48c 100644 --- a/app/models/merged/view_base.rb +++ b/app/models/merged/view_base.rb @@ -62,7 +62,7 @@ module Merged end def image - Image.find_by_name(@attributes[:image]) + Image.find_by_name(self.image_name) end end end diff --git a/test/dummy/merged/cards.yml b/test/dummy/merged/cards.yml index 9bc230d..d1ffc5f 100644 --- a/test/dummy/merged/cards.yml +++ b/test/dummy/merged/cards.yml @@ -3,7 +3,7 @@ :text: This is the standard two patient room. They are mostly towards the south, so may have great, or too much light, depending on how you see it. The size is about 3x5, cost 120e. - :image: standard + :image_name: standard :id: 6 :options: background: solid_blue @@ -16,7 +16,7 @@ :text: The old four patient rooms are basically twice the size as the small. They are large enough to be shared. The size is about 30m2 and the cost 240e. Like the small rooms these are south facing, very light. - :image: large + :image_name: large :id: 7 :options: background: solid_blue @@ -30,7 +30,7 @@ :text: There are smaller, rooms, and some connected rooms. If your needs are small, of you rather have 2 small rooms than one, talk to us. These are mostly old admin rooms facing north, starting at 100e. - :image: non_standard_room + :image_name: non_standard_room :options: background: solid_blue color: white @@ -47,7 +47,7 @@ background: solid_blue color: white align: left - :image: wet_space_room + :image_name: wet_space_room :updated_at: *1 :section_id: 11 :index: 4 @@ -55,7 +55,7 @@ :header: Common spaces :text: Each floor has it's own large common space. Also, Hub Feenix offers great public spaces, terraces, a cafe, co-working and maker spaces. - :image: common_spaces + :image_name: common_spaces :options: background: solid_red align: center @@ -66,7 +66,7 @@ :header: En suite and fold out :text: "Some rooms have attached (or shared) bathrooms. Also, you have the option of a fold-out bed to stay overnight.\r\nIt's like a home away from home." - :image: en_suite_studio + :image_name: en_suite_studio :options: background: solid_blue align: center @@ -81,7 +81,7 @@ :options: background: solid_indigo align: center - :image: studio_kitchen + :image_name: studio_kitchen :updated_at: *1 :section_id: 12 :index: 3 @@ -130,7 +130,7 @@ - :id: 39 :header: Cafe :text: Our cafe serves vegan and vegetarian light food and great tea and coffee. - :image: service_cafe + :image_name: service_cafe :options: background: light_gray color: solid_blue @@ -143,7 +143,7 @@ :header: Treatments :text: In our healery you can get professional help from osteopathy, shiatsu, acupuncture and more. - :image: service_treatments + :image_name: service_treatments :options: background: light_gray color: solid_blue @@ -156,7 +156,7 @@ :header: Boutique and Gallery :text: In our Boutique, you can find organic cosmetics, buy our great hub feenix teas to take home and find inspirational art from our artists. - :image: service_boutique + :image_name: service_boutique :options: background: light_gray color: solid_blue diff --git a/test/dummy/merged/sections.yml b/test/dummy/merged/sections.yml index e1a1b3d..e596bf4 100644 --- a/test/dummy/merged/sections.yml +++ b/test/dummy/merged/sections.yml @@ -6,7 +6,7 @@ Several floors of the building are reserved for artist studios. Some creative activities that require large equipment (presses, ovens) overlap strongly with the Makers idea. Have a look at the rooms available and tell us what you need. - :image: studios + :image_name: studios :options: button_link: '' button_text: '' @@ -22,7 +22,7 @@ The rooms are in the old hospital wings, so most are old patient rooms, but there are plenty of others too. Prices do not include electricity or vat, but do include the use of common spaces, see below. - :image: + :image_name: :id: 11 :card_template: card_full_image :options: @@ -66,7 +66,7 @@ :header: HUB FEENIX :text: Only an hour west of Helsinki, the Feenix rises from an old sanatorium. The Hub is a place to create, learn and regenerate. - :image: house + :image_name: house :id: 31 :options: fixed: 'on' @@ -91,7 +91,7 @@ button_link: retreats order: left background: solid_blue - :image: retreats + :image_name: retreats :id: 33 :updated_at: *2 :page_id: 6 @@ -106,7 +106,7 @@ button_link: '' button_text: '' background: solid_blue - :image: studios + :image_name: studios :id: 34 :updated_at: *2 :page_id: 6 @@ -121,7 +121,7 @@ button_link: makerspace order: left background: solid_blue - :image: makerspace + :image_name: makerspace :id: 35 :updated_at: *2 :page_id: 6 @@ -132,7 +132,7 @@ :text: We have various spaces for co-working and office rent. You can just come for the odd afternoon and work in a shared environment. Or rent your own office or even wing, from 15 to 500 m2. - :image: coworking_office + :image_name: coworking_office :options: order: right background: solid_blue @@ -151,7 +151,7 @@ :text: We offer meeting rooms from 20-80 people, with breakout rooms for work-group discussions. High-speed internet, video projectors, break-out rooms, all you need to organise your event. The cafe and surrounding nature make for ideal breaks. - :image: conferences + :image_name: conferences :options: order: left background: solid_blue @@ -171,7 +171,7 @@ rooms are generally of a corridor, either with or without own toilet and shower. This can suit artists who either rent a studio or use co-working facilities. But we also accept applications from people who are just between things. - :image: residency_accomodation + :image_name: residency_accomodation :options: order: right background: solid_blue