changed card and section style to active_yaml (because of entanglement :-)

2022-12-10 20:29:31 +02:00
parent d936fc05ab
commit 04e189f913
16 changed files with 51 additions and 70 deletions
--- a/app/controllers/merged/sections_controller.rb
+++ b/app/controllers/merged/sections_controller.rb
@ -10,11 +10,13 @@ module Merged
    def select_image
      @images = Image.all
    end
+
    def select_template
-      @sections = SectionStyle.sections
+      @sections = SectionStyle.all
    end
+
    def select_card_template
-      @cards = CardStyle.cards
+      @cards = CardStyle.all
    end

    def new
--- a/app/controllers/merged/styles_controller.rb
+++ b/app/controllers/merged/styles_controller.rb
@ -2,8 +2,8 @@ module Merged
  class StylesController < MergedController

    def index
-      @sections = SectionStyle.sections
-      @cards = CardStyle.cards
+      @section_styles = SectionStyle.all
+      @cards_styles = CardStyle.all
    end

  end