alchemy_cms 6.0.0.b1 → 6.0.0.pre.b5

data/app/models/alchemy/page/page_natures.rb

@@ -110,22 +110,13 @@ module Alchemy
       # If the page is the current preview it uses the updated_at value as cache key.
       #
       def cache_key
-        if Page.current_preview == self
+        if Page.current_preview == id
           "alchemy/pages/#{id}-#{updated_at}"
         else
           "alchemy/pages/#{id}-#{published_at}"
         end
       end
 
-      # We use the published_at value for the cache_key.
-      #
-      # If no published_at value is set yet, i.e. because it was never published,
-      # we return the updated_at value.
-      #
-      def published_at
-        read_attribute(:published_at) || updated_at
-      end
-
       # Returns true if the page cache control headers should be set.
       #
       # == Disable Alchemy's page caching globally

data/app/models/alchemy/page/page_scopes.rb

@@ -8,6 +8,10 @@ module Alchemy
       extend ActiveSupport::Concern
 
       included do
+        # All pages of given page layout
+        #
+        scope :by_page_layout, ->(page_layout) { where(page_layout: page_layout) }
+
         # All language root pages
         #
         scope :language_roots, -> { where(language_root: true) }

data/app/models/alchemy/page.rb

@@ -182,20 +182,29 @@ module Alchemy
       end
 
       def alchemy_resource_filters
-        %w[published not_public restricted]
+        [
+          {
+            name: :by_page_layout,
+            values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] },
+          },
+          {
+            name: :status,
+            values: %w[published not_public restricted],
+          },
+        ]
       end
 
       def searchable_alchemy_resource_attributes
         %w[name urlname title]
       end
 
-      # Used to store the current page previewed in the edit page template.
+      # Used to store the current page id previewed in the edit page template.
       #
       def current_preview=(page)
-        RequestStore.store[:alchemy_current_preview] = page
+        RequestStore.store[:alchemy_current_preview] = page&.id
       end
 
-      # Returns the current page previewed in the edit page template.
+      # Returns the current page id previewed in the edit page template.
       #
       def current_preview
         RequestStore.store[:alchemy_current_preview]

data/app/models/alchemy/page_version.rb

@@ -2,7 +2,7 @@
 
 module Alchemy
   class PageVersion < BaseRecord
-    belongs_to :page, class_name: "Alchemy::Page", inverse_of: :versions
+    belongs_to :page, class_name: "Alchemy::Page", inverse_of: :versions, touch: true
 
     has_many :elements, -> { order(:position) },
       class_name: "Alchemy::Element",

data/app/models/alchemy/picture.rb

@@ -116,6 +116,7 @@ module Alchemy
     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 :by_file_format, ->(format) { where(image_file_format: format) }
 
     # Class methods
 
@@ -134,6 +135,19 @@ module Alchemy
         @_url_class = klass
       end
 
+      def alchemy_resource_filters
+        [
+          {
+            name: :by_file_format,
+            values: distinct.pluck(:image_file_format),
+          },
+          {
+            name: :misc,
+            values: %w(recent last_upload without_tag),
+          },
+        ]
+      end
+
       def searchable_alchemy_resource_attributes
         %w(name image_file_name)
       end
@@ -144,34 +158,6 @@ module Alchemy
 
         Picture.where(upload_hash: last_picture.upload_hash)
       end
-
-      def search_by(params, query, per_page = nil)
-        pictures = query.result
-
-        if params[:tagged_with].present?
-          pictures = pictures.tagged_with(params[:tagged_with])
-        end
-
-        if params[:filter].present?
-          pictures = pictures.filtered_by(params[:filter])
-        end
-
-        if per_page
-          pictures = pictures.page(params[:page] || 1).per(per_page)
-        end
-
-        pictures.order(:name)
-      end
-
-      def filtered_by(filter = "")
-        case filter
-        when "recent" then recent
-        when "last_upload" then last_upload
-        when "without_tag" then without_tag
-        else
-          all
-        end
-      end
     end
 
     # Instance methods
@@ -203,16 +189,6 @@ module Alchemy
       nil
     end
 
-    def previous(params = {})
-      query = Picture.ransack(params[:q])
-      Picture.search_by(params, query).where("name < ?", name).last
-    end
-
-    def next(params = {})
-      query = Picture.ransack(params[:q])
-      Picture.search_by(params, query).where("name > ?", name).first
-    end
-
     # Updates name and tag_list attributes.
     #
     # Used by +Admin::PicturesController#update_multiple+

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -14,7 +14,7 @@
 
 <div id="assign_file_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
   <div id="library_sidebar">
-    <%= render 'filter_bar' %>
+    <%= render 'filter_bar' if resource_has_filters %>
 
     <% if Alchemy::Attachment.tag_counts.any? %>
       <div class="tag-list">

data/app/views/alchemy/admin/attachments/index.html.erb

@@ -7,8 +7,7 @@
         file_attribute: 'file' %>
     <% end %>
   </div>
-  <%= render 'alchemy/admin/partials/search_form',
-    additional_params: [:file_type, :tagged_with] %>
+  <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all" class="with_tag_filter resources-table-wrapper">
@@ -16,7 +15,7 @@
   <%= render 'files_list' %>
 
   <div id="library_sidebar">
-    <%= render 'filter_bar' %>
+    <%= render 'filter_bar' if resource_has_filters %>
 
     <% if Alchemy::Attachment.tag_counts.any? %>
       <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">

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.to_json %>);
+  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.focusElementPreview(<%= @element.id %>);
   });

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

@@ -3,9 +3,7 @@ $('#element_<%= @element.id %>').hide(200, function() {
   Alchemy.growl('<%= j @notice %>');
   $('#element_area .sortable-elements').sortable('refresh');
   Alchemy.PreviewWindow.refresh();
-  <% @element.richtext_contents_ids.each do |id| %>
-  tinymce.get('tinymce_<%= id %>').remove();
-  <% end %>
+  Alchemy.Tinymce.remove(<%= @richtext_ids.to_json %>);
   <% if @element.fixed? %>
   Alchemy.FixedElements.removeTab(<%= @element.id %>);
   <% end %>

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

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

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-content .content_editor, > .element-content .ingredient-editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 

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

@@ -74,4 +74,4 @@
 <% search_filter_params[:view] = "list" %>
 <%= render "alchemy/admin/partials/search_form",
   url: alchemy.admin_pages_path(search_filter_params.except(:q, :page)),
-  additional_params: [:view, :page_layout, :tagged_with, :filter] %>
+  additional_params: [:view] %>

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

@@ -138,7 +138,7 @@
 <% end %>
 
 <% content_for :javascripts do %>
-<% if Alchemy::Tinymce.custom_config_contents(@page).present? %>
+<% if Alchemy::Tinymce.custom_configs_present?(@page) %>
   <%= render 'tinymce_custom_config' %>
 <% end %>
 

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

@@ -24,15 +24,8 @@
     <%= paginate @pages, scope: alchemy, theme: "alchemy" %>
 
     <div id="library_sidebar">
-      <%= render "page_layout_filter" %>
-
-      <%= render "filter_bar",
-        label: Alchemy::Page.human_attribute_name(:status),
-        url: alchemy.admin_pages_path(search_filter_params.except(:filter, :page).merge(view: "list")) %>
-
-      <% if resource_has_tags %>
-        <%= render "tag_list" %>
-      <% end %>
+      <%= render "filter_bar" if resource_has_filters %>
+      <%= render "tag_list" if resource_has_tags %>
     </div>
   <% else %>
     <% if @page_root %>

data/app/views/alchemy/admin/partials/_search_form.html.erb

@@ -16,6 +16,15 @@
         id: 'search_field_clear',
         title: Alchemy.t(:click_to_show_all),
         style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
+
+    <% search_filter_params.fetch(:filter, []).each do |filter_param| %>
+      <%= hidden_field_tag "filter[#{filter_param[0]}]", filter_param[1], id: nil %>
+    <% end %>
+
+    <% if search_filter_params.fetch(:tagged_with, nil) %>
+      <%= hidden_field_tag :tagged_with, search_filter_params.fetch(:tagged_with), id: nil %>
+    <% end %>
+
     <% local_assigns.fetch(:additional_params, []).each do |additional_param| %>
       <%= hidden_field_tag additional_param, search_filter_params[additional_param], id: nil %>
     <% end %>

data/app/views/alchemy/admin/pictures/_archive.html.erb

@@ -1,5 +1,5 @@
 <div id="library_sidebar">
-  <%= render 'filter_bar' %>
+  <%= render 'filter_bar' if resource_has_filters %>
 
   <% if Alchemy::Picture.tag_counts.any? %>
     <div class="tag-list with_filter_bar<%= ' filtered' if search_filter_params[:tagged_with].present? %>">

data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb

@@ -3,7 +3,7 @@
 </div>
 <div id="assign_image_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
   <div id="library_sidebar">
-    <%= render 'filter_bar' %>
+    <%= render 'filter_bar' if resource_has_filters %>
     <div class="tag-list">
       <%= render 'tag_list' %>
     </div>

data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb

@@ -7,8 +7,10 @@
       in_dialog: true,
       redirect_url: alchemy.admin_pictures_path(
         size: search_filter_params[:size],
-        filter: 'last_upload',
-        form_field_id: @form_field_id
+        filter: { misc: 'last_upload' },
+        form_field_id: @form_field_id,
+        content_id: @content.try(:id),
+        element_id: @element.try(:id)
       ) %>
     <div class="toolbar_spacer"></div>
   <% end %>

data/app/views/alchemy/admin/pictures/index.html.erb

@@ -6,7 +6,7 @@
         file_attribute: 'image_file',
         redirect_url: alchemy.admin_pictures_path(
           size: @size,
-          filter: 'last_upload'
+          filter: { misc: 'last_upload' }
         ) %>
       <div class="toolbar_spacer"></div>
     <% end %>
@@ -67,7 +67,7 @@
   </div>
 
   <%= render 'alchemy/admin/partials/search_form',
-    additional_params: [:filter, :tagged_with, :size] %>
+    additional_params: [:size] %>
 <% end %>
 
 <div id="picture_archive" class="resources-table-wrapper with_tag_filter">
@@ -75,7 +75,12 @@
     <h2>
       <%= @pictures.total_count %>
       <%= Alchemy::Picture.model_name.human(count: @pictures.total_count) %>
-      <%= Alchemy.t("picture_library.filter.#{search_filter_params[:filter]}") if search_filter_params[:filter].present? %>
+      <% if search_filter_params[:filter].present? %>
+        <%= Alchemy.t("filtered_by") %>
+        <% search_filter_params[:filter].each do |k, v| %>
+          <span class="applied-filter"><%= Alchemy.t("filters.picture.#{k}.values.#{v}") %></span>
+        <% end %>
+      <% end %>
     </h2>
   </div>
   <%= render 'archive' %>

data/app/views/alchemy/admin/resources/_filter.html.erb

@@ -0,0 +1,12 @@
+<label>
+  <h3><%= Alchemy.t("name", scope: ["filters", resource_name, filter.name]) || Alchemy.t('Filter') %></h3>
+  <%= select_tag(
+    filter.name,
+    options_for_select(
+      filter.options_for_select, params[:filter].try(:[], filter.name)
+    ),
+    include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
+    data: { remote: !!request.xhr? },
+    class: 'alchemy_selectbox'
+  ) %>
+</label>

data/app/views/alchemy/admin/resources/_filter_bar.html.erb

@@ -1,28 +1,25 @@
 <div id="filter_bar">
-  <label>
-    <h3><%= local_assigns[:label] || Alchemy.t('Filter') %></h3>
-    <%= select_tag(
-      'resource_filter',
-      options_for_select(
-        resource_filter_select, search_filter_params[:filter]
-      ),
-      include_blank: Alchemy.t(:all, scope: ['resources', resource_name, 'filters']),
-      data: { remote: !!request.xhr? },
-      class: 'alchemy_selectbox'
-    ) %>
-  </label>
+  <%= render partial: "filter", collection: resource_filters_for_select %>
 </div>
 
 <script type="text/javascript">
   $(function() {
-    $('#resource_filter').on('change', function(e) {
+    $('select', '#filter_bar').on('change', function(e) {
       var $this = $(this);
-      var url = '<%= local_assigns[:url] || resources_path(resource_handler.namespaced_resources_name, search_filter_params.except(:filter).to_h) %>';
+      var filter_param = 'filter['+$this.attr('name')+']';
+      var path = '<%= resources_path(resource_handler.namespaced_resources_name) %>';
+      var params = new URLSearchParams('<%= raw search_filter_params.to_query %>');
+
+      if ($this.val() === "") {
+        params.delete(filter_param);
+      } else {
+        params.set(filter_param, $this.val());
+      }
+
       if ($this.data('remote') === true) {
-        $.get(url, {filter: $this.val()}, null, 'script');
+        $.get(path, params.toString(), null, 'script');
       } else {
-        delimiter = url.match(/\?/) ? '&' : '?';
-        Turbolinks.visit(url + delimiter + 'filter=' + encodeURIComponent($this.val()));
+        Turbolinks.visit(path + '?' + params.toString());
       }
       return false;
     });

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -6,6 +6,8 @@
         label_method: relation[:attr_method],
         include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
         input_html: {class: 'alchemy_selectbox'} %>
+    <% elsif attribute[:type].in? %i[date time datetime] %>
+      <%= f.datepicker attribute[:name], resource_attribute_field_options(attribute) %>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>

data/app/views/alchemy/admin/resources/_table_header.html.erb

@@ -1,4 +1,19 @@
 <div class="resources-header">
+  <% if search_filter_params[:filter].present? %>
+    <b><%= Alchemy.t("filtered_by") %></b>
+    <% search_filter_params[:filter].each do |k, v| %>
+      <%- tmp_params = search_filter_params.dup -%>
+      <%- tmp_params[:filter] = tmp_params[:filter].except(k) -%>
+      <%- dismiss_filter_url = resource_url_proxy.url_for(
+                                { action: 'index' }.merge(tmp_params.except(:page))
+                              ) -%>
+      <div class="applied-filter">
+        <%= Alchemy.t("filters.#{resource_handler.resource_name}.#{k}.values.#{v}", default: v) %>
+        <%= link_to render_icon(:times, size: 'xs'), dismiss_filter_url, class: 'dismiss-filter' %>
+      </div>
+    <% end %>
+  <% end %>
+
   <h2>
     <%= resources_instance_variable.total_count %>
     <%= resource_model.model_name.human(count: resources_instance_variable.total_count) %>