alchemy_cms 6.1.5 → 7.0.0.pre.b

data/app/models/alchemy/picture.rb

@@ -25,7 +25,7 @@ module Alchemy
     THUMBNAIL_SIZES = {
       small: "80x60",
       medium: "160x120",
-      large: "240x180",
+      large: "240x180"
     }.with_indifferent_access.freeze
 
     CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
@@ -38,7 +38,7 @@ module Alchemy
       :format,
       :quality,
       :size,
-      :upsample,
+      :upsample
     ]
 
     include Alchemy::Logger
@@ -47,17 +47,16 @@ module Alchemy
     include Alchemy::TouchElements
     include Calculations
 
-    has_many :essence_pictures,
-      class_name: "Alchemy::EssencePicture",
-      foreign_key: "picture_id",
-      inverse_of: :ingredient_association
+    has_many :picture_ingredients,
+      class_name: "Alchemy::Ingredients::Picture",
+      foreign_key: "related_object_id",
+      inverse_of: :related_object
 
-    has_many :contents, through: :essence_pictures
-    has_many :elements, through: :contents
+    has_many :elements, through: :picture_ingredients
     has_many :pages, through: :elements
     has_many :thumbs, class_name: "Alchemy::PictureThumb", dependent: :destroy
 
-    # Raise error, if picture is in use (aka. assigned to an EssencePicture)
+    # Raise error, if picture is in use (aka. assigned to an Picture ingredient)
     #
     # === CAUTION
     #
@@ -65,7 +64,7 @@ module Alchemy
     # to ensure this runs before Dragonfly's before_destroy callback.
     #
     before_destroy unless: :deletable? do
-      raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % { name: name }
+      raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % {name: name}
     end
 
     # Image preprocessing class
@@ -114,8 +113,11 @@ module Alchemy
 
     scope :named, ->(name) { where("#{table_name}.name LIKE ?", "%#{name}%") }
     scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
-    scope :deletable, -> { where("#{table_name}.id NOT IN (SELECT picture_id FROM #{EssencePicture.table_name})") }
-    scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: { id: nil }) }
+    scope :deletable,
+      -> {
+        where("#{table_name}.id NOT IN (SELECT related_object_id FROM alchemy_ingredients WHERE related_object_type = 'Alchemy::Picture')")
+      }
+    scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) }
     scope :by_file_format, ->(format) { where(image_file_format: format) }
 
     # Class methods
@@ -140,17 +142,17 @@ module Alchemy
         [
           {
             name: :by_file_format,
-            values: @_file_formats,
+            values: @_file_formats
           },
           {
             name: :misc,
-            values: %w(recent last_upload without_tag deletable),
-          },
+            values: %w[recent last_upload without_tag deletable]
+          }
         ]
       end
 
       def searchable_alchemy_resource_attributes
-        %w(name image_file_name)
+        %w[name image_file_name]
       end
 
       def last_upload
@@ -182,7 +184,7 @@ module Alchemy
         options.except(*TRANSFORMATION_OPTIONS).merge(
           basename: name,
           ext: variant.render_format,
-          name: name,
+          name: name
         )
       )
     rescue ::Dragonfly::Job::Fetch::NotFound => e
@@ -210,7 +212,7 @@ module Alchemy
       {
         name: image_file_name,
         size: image_file_size,
-        error: errors[:image_file].join,
+        error: errors[:image_file].join
       }
     end
 
@@ -280,10 +282,10 @@ module Alchemy
       pages.any? && pages.not_restricted.blank?
     end
 
-    # Returns true if picture is not assigned to any EssencePicture.
+    # Returns true if picture is not assigned to any Picture ingredient.
     #
     def deletable?
-      essence_pictures.empty?
+      picture_ingredients.empty?
     end
 
     # A size String from original image file values.

data/app/models/alchemy/picture_thumb/create.rb

@@ -2,9 +2,11 @@
 
 module Alchemy
   class PictureThumb < BaseRecord
-    # Stores the render result of a Alchemy::PictureVariant
-    # in the configured Dragonfly datastore
-    # (Default: Dragonfly::FileDataStore)
+    # Creates a Alchemy::PictureThumb
+    #
+    # Stores the processes result of a Alchemy::PictureVariant
+    # in the configured +Alchemy::PictureThumb.storage_class+
+    # (Default: {Alchemy::PictureThumb::FileStore})
     #
     class Create
       class << self
@@ -24,26 +26,13 @@ module Alchemy
             thumb.uid = uid
           end
           begin
-            # process the image
-            image = variant.image
-            # store the processed image
-            image.to_file(server_path(uid)).close
-          rescue RuntimeError => e
+            Alchemy::PictureThumb.storage_class.call(variant, uid)
+          rescue => e
             ErrorTracking.notification_handler.call(e)
             # destroy the thumb if processing or storing fails
             @thumb&.destroy
           end
         end
-
-        private
-
-        # Alchemys dragonfly datastore config seperates the storage path from the public server
-        # path for security reasons. The Dragonfly FileDataStorage does not support that,
-        # so we need to build the path on our own.
-        def server_path(uid)
-          dragonfly_app = ::Dragonfly.app(:alchemy_pictures)
-          "#{dragonfly_app.datastore.server_root}/#{uid}"
-        end
       end
     end
   end

data/app/models/alchemy/picture_thumb/file_store.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PictureThumb < BaseRecord
+    # Stores the render result of a Alchemy::PictureVariant
+    # in the configured Dragonfly datastore
+    # (Default: Dragonfly::FileDataStore)
+    #
+    class FileStore
+      class << self
+        # @param [Alchemy::PictureVariant] variant the to be rendered image
+        # @param [String] uid The Unique Image Identifier the image is stored at
+        #
+        def call(variant, uid)
+          # process the image
+          image = variant.image
+          # store the processed image
+          image.to_file(server_path(uid)).close
+        end
+
+        private
+
+        # Alchemys dragonfly datastore config seperates the storage path from the public server
+        # path for security reasons. The Dragonfly FileDataStorage does not support that,
+        # so we need to build the path on our own.
+        def server_path(uid)
+          dragonfly_app = ::Dragonfly.app(:alchemy_pictures)
+          "#{dragonfly_app.datastore.server_root}/#{uid}"
+        end
+      end
+    end
+  end
+end

data/app/models/alchemy/picture_thumb.rb

@@ -7,7 +7,7 @@ module Alchemy
   # different thumbnail store (ie. a remote file storage).
   #
   #     config/initializers/alchemy.rb
-  #     Alchemy::PictureThumb.generator_class = My::ThumbnailGenerator
+  #     Alchemy::PictureThumb.storage_class = My::ThumbnailStore
   #
   class PictureThumb < BaseRecord
     belongs_to :picture, class_name: "Alchemy::Picture"
@@ -16,18 +16,18 @@ module Alchemy
     validates :uid, presence: true
 
     class << self
-      # Thumbnail generator class
+      # Thumbnail storage class
       #
-      # @see Alchemy::PictureThumb::Create
-      def generator_class
-        @_generator_class ||= Alchemy::PictureThumb::Create
+      # @see Alchemy::PictureThumb::FileStore
+      def storage_class
+        @_storage_class ||= Alchemy::PictureThumb::FileStore
       end
 
-      # Set a thumbnail generator class
+      # Set a thumbnail storage class
       #
-      # @see Alchemy::PictureThumb::Create
-      def generator_class=(klass)
-        @_generator_class = klass
+      # @see Alchemy::PictureThumb::FileStore
+      def storage_class=(klass)
+        @_storage_class = klass
       end
 
       # Upfront generation of picture thumbnails
@@ -42,14 +42,14 @@ module Alchemy
         Alchemy::Picture::THUMBNAIL_SIZES.values.each do |size|
           variant = Alchemy::PictureVariant.new(picture, {
             size: size,
-            flatten: true,
+            flatten: true
           })
           signature = Alchemy::PictureThumb::Signature.call(variant)
           thumb = find_by(signature: signature)
           next if thumb
 
           uid = Alchemy::PictureThumb::Uid.call(signature, variant)
-          generator_class.call(variant, signature, uid)
+          Alchemy::PictureThumb::Create.call(variant, signature, uid)
         end
       end
     end

data/app/models/alchemy/picture_variant.rb

@@ -54,8 +54,7 @@ module Alchemy
       raise MissingImageFileError, "Missing image file for #{picture.inspect}" if image.nil?
 
       image = processed_image(image, @options)
-      image = encoded_image(image, @options)
-      image
+      encoded_image(image, @options)
     rescue MissingImageFileError, WrongImageFormatError => e
       log_warning(e.message)
       nil
@@ -88,7 +87,7 @@ module Alchemy
       end
 
       options = {
-        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif",
+        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif"
       }.with_indifferent_access.merge(options)
 
       encoding_options = []

data/app/models/alchemy/tag.rb

@@ -13,6 +13,14 @@
 # The original Tag model is Gutentag::Tag
 module Alchemy
   class Tag < Gutentag::Tag
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[created_at id name taggings_count updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[taggings]
+    end
+
     # Replaces tag with new tag on all models tagged with tag.
     def self.replace(tag, new_tag)
       tag.taggings.collect(&:taggable).each do |taggable|

data/app/models/concerns/alchemy/picture_thumbnails.rb

@@ -20,7 +20,7 @@ module Alchemy
     #
     # === Example:
     #
-    #   essence_picture.picture_url(size: '200x300', crop: true, format: 'gif')
+    #   picture_view.picture_url(size: '200x300', crop: true, format: 'gif')
     #   # '/pictures/1/show/200x300/crop/cats.gif?sh=765rfghj'
     #
     # @option options size [String]
@@ -56,7 +56,7 @@ module Alchemy
         crop: crop,
         crop_from: crop && crop_from.presence || nil,
         crop_size: crop && crop_size.presence || nil,
-        size: settings[:size],
+        size: settings[:size]
       }.with_indifferent_access
     end
 
@@ -84,7 +84,7 @@ module Alchemy
         crop_from: crop && crop_from.presence || default_crop_from&.join("x"),
         crop_size: crop && crop_size.presence || default_crop_size&.join("x"),
         flatten: true,
-        format: picture&.image_file_format || "jpg",
+        format: picture&.image_file_format || "jpg"
       }
     end
 
@@ -96,16 +96,16 @@ module Alchemy
         default_crop_size: default_crop_size,
         fixed_ratio: settings[:fixed_ratio],
         image_width: picture&.image_file_width,
-        image_height: picture&.image_file_height,
+        image_height: picture&.image_file_height
       ).to_h
     end
 
-    # Show image cropping link for content
+    # Show image cropping link for ingredient
     def allow_image_cropping?
       settings[:crop] && picture &&
         picture.can_be_cropped_to?(
           settings[:size],
-          settings[:upsample],
+          settings[:upsample]
         ) && !!picture.image_file
     end
 
@@ -124,7 +124,7 @@ module Alchemy
     def thumbnail_zoom_factor(mask)
       [
         mask[0].to_f / (image_file_width || 1),
-        mask[1].to_f / (image_file_height || 1),
+        mask[1].to_f / (image_file_height || 1)
       ].max
     end
 
@@ -134,7 +134,7 @@ module Alchemy
 
       [
         ((image_file_width || 0) - default_crop_size[0]) / 2,
-        ((image_file_height || 0) - default_crop_size[1]) / 2,
+        ((image_file_height || 0) - default_crop_size[1]) / 2
       ].map(&:round)
     end
 

data/app/serializers/alchemy/base_serializer.rb

@@ -14,7 +14,7 @@ module Alchemy
     # The attributes to be serialized. See ActiveModel::Serialization.
     # By default, serialize all columns from the AR object.
     def attributes
-      Hash[object.class.column_names.map { |c| [c, nil] }]
+      object.class.column_names.map { |c| [c, nil] }.to_h
     end
 
     private

data/app/serializers/alchemy/element_serializer.rb

@@ -10,16 +10,11 @@ module Alchemy
       :tag_list,
       :created_at,
       :updated_at,
-      :ingredients,
-      :content_ids,
       :dom_id,
       :display_name
 
     has_many :nested_elements
-
-    def ingredients
-      object.contents.collect(&:serialize)
-    end
+    has_many :ingredients
 
     def display_name
       object.display_name_with_preview_text

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -3,13 +3,13 @@
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes
-      { "pages" => nil }
+      {"pages" => nil}
     end
 
     def pages
       tree = []
-      path = [{ id: object.parent_id, children: tree }]
-      page_list = object.self_and_descendants.includes(:public_version, { language: :site })
+      path = [{id: object.parent_id, children: tree}]
+      page_list = object.self_and_descendants.includes(:public_version, {language: :site})
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
@@ -61,7 +61,7 @@ module Alchemy
         level: level,
         root: page.root?,
         root_or_leaf: page.root? || page.leaf?,
-        children: [],
+        children: []
       }
 
       if opts[:elements]
@@ -75,7 +75,7 @@ module Alchemy
           locked: page.locked?,
           locked_notice: page.locked? ? Alchemy.t("This page is locked", name: page.locker_name) : nil,
           permissions: page_permissions(page, opts[:ability]),
-          status_titles: page_status_titles(page),
+          status_titles: page_status_titles(page)
         })
       else
         p_hash
@@ -98,14 +98,14 @@ module Alchemy
         copy: ability.can?(:copy, page),
         destroy: ability.can?(:destroy, page),
         create: ability.can?(:create, Alchemy::Page),
-        edit_content: ability.can?(:edit_content, page),
+        edit_content: ability.can?(:edit_content, page)
       }
     end
 
     def page_status_titles(page)
       {
         public: page.status_title(:public),
-        restricted: page.status_title(:restricted),
+        restricted: page.status_title(:restricted)
       }
     end
   end

data/app/services/alchemy/delete_elements.rb

@@ -3,6 +3,7 @@
 module Alchemy
   class DeleteElements
     class WouldLeaveOrphansError < StandardError; end
+
     attr_reader :elements
 
     def initialize(elements)
@@ -14,13 +15,6 @@ module Alchemy
         raise WouldLeaveOrphansError
       end
 
-      contents = Alchemy::Content.where(element_id: elements.map(&:id))
-      contents.group_by(&:essence_type)
-        .transform_values! { |value| value.map(&:essence_id) }
-        .each do |class_name, ids|
-          class_name.constantize.where(id: ids).delete_all
-        end
-      contents.delete_all
       Gutentag::Tagging.where(taggable: elements).delete_all
       delete_elements
     end

data/app/services/alchemy/duplicate_element.rb

@@ -10,7 +10,7 @@ module Alchemy
       "id",
       "folded",
       "updated_at",
-      "updater_id",
+      "updater_id"
     ].freeze
 
     attr_reader :source_element, :repository
@@ -25,20 +25,15 @@ module Alchemy
         .except(*SKIPPED_ATTRIBUTES_ON_COPY)
         .merge(differences)
         .merge(
-          autogenerate_contents: false,
           autogenerate_ingredients: false,
           autogenerate_nested_elements: false,
-          tags: source_element.tags,
+          tags: source_element.tags
         )
 
       new_element = Element.new(attributes)
       new_element.ingredients = source_element.ingredients.map(&:dup)
       new_element.save!
 
-      source_element.contents.map do |content|
-        Content.copy(content, element: new_element)
-      end
-
       nested_elements = repository.children_of(source_element)
       Element.acts_as_list_no_update do
         nested_elements.each.with_index(1) do |nested_element, position|

data/app/services/alchemy/tag_validations.rb

@@ -11,7 +11,7 @@ module Alchemy
     end
 
     def call
-      klass.validates :name, presence: true, uniqueness: { case_sensitive: true }
+      klass.validates :name, presence: true, uniqueness: {case_sensitive: true}
     end
 
     private

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -20,7 +20,7 @@
 
     <% if element.editable? %>
       <%= form_for [alchemy, :admin, element], remote: true,
-        html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
+        html: {id: "element_#{element.id}_form".html_safe, class: 'element-body'} do |f| %>
 
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
 
@@ -31,35 +31,18 @@
 
             <!-- Each ingredient group -->
             <% element.ingredients.select { |i| i.definition[:group] }.group_by { |i| i.definition[:group] }.each do |group, ingredients| %>
-              <div class="content-group">
-                <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
+              <div class="ingredient-group">
+                <%= link_to '#', id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}_header", class: 'ingredient-group-header', data: { toggle_ingredient_group: true } do %>
                   <%= element.translated_group group %>
-                  <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
+                  <i class="ingredient-group-expand icon fa-fw fa-angle-down fas"></i>
                 <% end %>
-                <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
+                <%= content_tag :div, id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}", class: 'ingredient-group-ingredients' do %>
                   <%= render ingredients, element_form: f %>
                 <% end %>
               </div>
             <% end %>
           </div>
         <% end %>
-        <!-- Contents -->
-        <div id="element_<%= element.id %>_content" class="element-content-editors">
-          <%= render element.contents.select { |c| !c.definition[:group] } %>
-
-          <!-- Each content group -->
-          <% element.contents.select { |c| c.definition[:group] }.group_by { |c| c.definition[:group] }.each do |group, contents| %>
-            <div class="content-group">
-              <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
-                <%= element.translated_group group %>
-                <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
-              <% end %>
-              <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
-                <%= render contents, element_form: f %>
-              <% end %>
-            </div>
-          <% end %>
-        </div>
 
         <% if element.taggable? %>
           <div class="autocomplete_tag_list">
@@ -73,6 +56,9 @@
     <% end %>
   <% end %>
 
+  <%# We need to render nested elements even if the element is folded,
+      because we need the element present in the DOM for the feature
+      "click element in the preview => load and expand element editor". %>
   <% if element.nestable_elements.any? %>
     <div class="nestable-elements">
       <%= content_tag :div,

data/app/views/alchemy/admin/elements/create.js.erb

@@ -34,7 +34,7 @@
 
   Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
   Alchemy.closeCurrentDialog();
-  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.focusElementPreview(<%= @element.id %>);
   });

data/app/views/alchemy/admin/elements/fold.js.erb

@@ -14,12 +14,12 @@
 
   <% if @element.folded? -%>
 
-  Alchemy.Tinymce.remove(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.remove(<%= @element.richtext_ingredients_ids.to_json %>);
 
   <% else -%>
 
   $el.trigger('FocusElementEditor.Alchemy');
-  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
   Alchemy.GUI.initElement($el);
   Alchemy.SortableElements(
     <%= @page.id %>,

data/app/views/alchemy/admin/elements/order.js.erb

@@ -1,5 +1,5 @@
 (function() {
-<% if @parent_element && @parent_element.contents.empty? %>
+<% if @parent_element && @parent_element.ingredients.empty? %>
   var $parent = $('#element_<%= @parent_element.id %>');
   Alchemy.ElementEditors.setTitle(
     $parent,

data/app/views/alchemy/admin/elements/update.js.erb

@@ -1,7 +1,7 @@
 (function() {
   var $el = $('#element_<%= @element.id %>');
   var $errors = $('#element_<%= @element.id %>_errors');
-  $('> .element-content .content_editor, > .element-content .ingredient-editor', $el).removeClass('validation_failed');
+  $('> .element-body .ingredient-editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 
@@ -20,7 +20,6 @@
   Alchemy.growl('<%= j @notice %>', 'warn');
   $errors.html('<%= j @error_message %><ul><li><%== j @error_messages.join("</li><li>") %></li></ul>');
   $errors.show();
-  $('<%= @element.contents_with_errors.map { |content| "#" + content.dom_id }.join(", ") %>').addClass('validation_failed');
   $('<%== @element.ingredients_with_errors.map { |ingredient| "[data-ingredient-id=\"#{ingredient.id}\"]" }.join(", ") %>').addClass('validation_failed');
   Alchemy.Buttons.enable($el);
 

data/app/views/alchemy/admin/pages/_external_link.html.erb

@@ -8,8 +8,8 @@
     <ul></ul>
   </div>
   <div class="input text">
-    <label for="external_url" class="control-label">URL</label>
-    <%= text_field_tag "external_url" %>
+    <label for="external_link" class="control-label">URL</label>
+    <%= text_field_tag "external_link" %>
   </div>
   <div class="input text">
     <label for="external_link_title" class="control-label">

data/app/views/alchemy/admin/pages/_file_link.html.erb

@@ -3,10 +3,10 @@
     <h3><%= Alchemy.t(:choose_file_to_link) %></h3>
   <% end %>
   <div class="input select">
-    <label for="public_filename" class="control-label">
+    <label for="file_link" class="control-label">
       <%= Alchemy.t(:file) %>
     </label>
-    <%= select_tag "public_filename",
+    <%= select_tag "file_link",
       options_for_select(@attachments),
       prompt: Alchemy.t('Please choose'),
       class: "alchemy_selectbox" %>

data/app/views/alchemy/admin/pages/_internal_link.html.erb

@@ -4,10 +4,10 @@
     <p><%= Alchemy.t(:internal_link_page_elements_explanation) %></p>
   <% end %>
   <div class="input select">
-    <label for="page_urlname" class="control-label">
+    <label for="internal_link" class="control-label">
       <%= Alchemy.t(:page) %>
     </label>
-    <input type="text" id="page_urlname" class="alchemy_selectbox full_width">
+    <input type="text" id="internal_link" class="alchemy_selectbox full_width">
   </div>
   <div class="input select">
     <label for="element_anchor" class="control-label">

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -138,9 +138,6 @@
 <% end %>
 
 <% content_for :javascripts do %>
-<% if Alchemy::Tinymce.custom_configs_present?(@page) %>
-  <%= render 'tinymce_custom_config' %>
-<% end %>
 
 <% content_for :javascript_includes do %>
   <meta name="turbolinks-cache-control" content="no-cache">
@@ -197,7 +194,7 @@
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element-editor');
-      Alchemy.Tinymce.init(<%= (@page.richtext_contents_ids + @page.richtext_ingredients_ids).to_json %>);
+      Alchemy.Tinymce.init(<%= @page.richtext_ingredients_ids.to_json %>);
       $('#fixed-elements').tabs().tabs('paging', {
         follow: true,
         followOnSelect: true,