alchemy_cms 2.2.rc14 → 2.2.rc15

data/app/models/alchemy/element.rb

@@ -31,6 +31,7 @@ module Alchemy
     scope :trashed, where(:page_id => nil).order('updated_at DESC')
     scope :not_trashed, where(Element.arel_table[:page_id].not_eq(nil))
     scope :published, where(:public => true)
+    scope :available, published.not_trashed
     scope :named, lambda { |names| where(:name => names) }
     scope :excluded, lambda { |names| where(arel_table[:name].not_in(names)) }
     scope :not_in_cell, where(:cell_id => nil)
@@ -485,9 +486,8 @@ module Alchemy
     end
 
     def rtf_contents
-      contents.select { |content| content.essence_type == 'Alchemy::EssenceRichtext' }
+      contents.essence_richtexts.all
     end
-
     alias_method :richtext_contents, :rtf_contents
 
     # The name of the cell the element could be placed in.
@@ -508,7 +508,7 @@ module Alchemy
       'original'
     end
 
-    private
+  private
 
     # creates the contents for this element as described in the elements.yml
     def create_contents

data/app/models/alchemy/message.rb

@@ -29,8 +29,12 @@ module Alchemy
 
     @@config['validate_fields'].each do |field|
       validates_presence_of field
-      if field.to_s == 'email'
+
+      case field.to_sym
+      when :email
         validates_format_of field, :with => ::Authlogic::Regex.email, :if => :email_is_filled
+      when :email_confirmation
+        validates_confirmation_of :email
       end
     end
 

data/app/models/alchemy/page.rb

@@ -27,7 +27,7 @@ module Alchemy
       :visible
     )
 
-    RESERVED_URLNAMES = %w(admin messages)
+    RESERVED_URLNAMES = %w(admin messages new)
 
     acts_as_nested_set(:dependent => :destroy)
     stampable(:stamper_class_name => 'Alchemy::User')
@@ -35,6 +35,7 @@ module Alchemy
     has_many :folded_pages
     has_many :cells, :dependent => :destroy
     has_many :elements, :dependent => :destroy, :order => :position
+    has_many :contents, :through => :elements
     has_and_belongs_to_many :to_be_sweeped_elements, :class_name => 'Alchemy::Element', :uniq => true, :join_table => 'alchemy_elements_alchemy_pages'
     belongs_to :language
 
@@ -79,6 +80,12 @@ module Alchemy
     scope :flushables, not_locked.published.contentpages
     scope :searchables, not_restricted.published.contentpages
 
+    # Using the urlname value as id parameter in URLs.
+    # Falls back to id, if no urlname is set yet.
+    def to_param
+      urlname || id.to_s
+    end
+
     # Finds selected elements from page.
     #
     # Options are:
@@ -98,7 +105,11 @@ module Alchemy
         elements = options[:from_cell].elements
       elsif !options[:from_cell].blank? && options[:from_cell].class.name == 'String'
         cell = cells.find_by_name(options[:from_cell])
-        elements = cell ? cell.elements : nil
+        if cell
+          elements = cell.elements
+        else
+          raise(ActiveRecord::RecordNotFound, "Cell with name `#{options[:from_cell]}` could not be found!")
+        end
       else
         elements = self.elements.not_in_cell
       end
@@ -110,15 +121,11 @@ module Alchemy
       elements = elements.reverse_order if options[:reverse_sort] || options[:reverse]
       elements = elements.offset(options[:offset]).limit(options[:count])
       elements = elements.order("RAND()") if options[:random]
-      if show_non_public
-        elements
-      else
-        elements.published
-      end
+      show_non_public ? elements : elements.published
     end
 
-    def find_elements(options = {}, show_non_public = false) #:nodoc:
-                                                             # TODO: What is this? A Kind of proxy method? Why not rendering the elements directly if you already have them????
+    # What is this? A Kind of proxy method? Why not rendering the elements directly if you already have them????
+    def find_elements(options = {}, show_non_public = false)
       if !options[:collection].blank? && options[:collection].is_a?(Array)
         return options[:collection]
       else
@@ -329,7 +336,8 @@ module Alchemy
 
     def controller_and_action
       if self.has_controller?
-        {:controller => self.layout_description["controller"], :action => self.layout_description["action"]}
+        controller = self.layout_description["controller"].gsub(/^([^\/])/, "/#{$1}")
+        {:controller => controller, :action => self.layout_description["action"]}
       end
     end
 
@@ -527,7 +535,11 @@ module Alchemy
       self.root
     end
 
-    private
+    def cache_key(request = nil)
+      "alchemy/#{language_code}/#{urlname}"
+    end
+
+  private
 
     def find_next_or_previous_page(direction = "next", options = {})
       if direction == "previous"

data/app/sweepers/alchemy/content_sweeper.rb

@@ -4,16 +4,15 @@ module Alchemy
     observe Element, Page
 
     def after_create(object)
-      if object.class.to_s == "Alchemy::Page"
-        expire_contents_displayed_as_select(object)
-      end
+      expire_contents_displayed_as_select
     end
 
     def after_update(object)
       if object.class.to_s == "Alchemy::Element"
         expire_cache_for(object.contents)
-      elsif object.class.to_s == "Alchemy::Page"
-        expire_contents_displayed_as_select(object)
+        expire_contents_displayed_as_select
+      elsif object.class.to_s == "Alchemy::Page" && (object.urlname_changed? || object.name_changed?)
+        expire_contents_displayed_as_select
       end
     end
 
@@ -21,7 +20,7 @@ module Alchemy
       if object.class.to_s == "Alchemy::Element"
         expire_cache_for(object.contents)
       elsif object.class.to_s == "Alchemy::Page"
-        expire_contents_displayed_as_select(object)
+        expire_contents_displayed_as_select
       end
     end
 
@@ -34,8 +33,7 @@ module Alchemy
     end
 
     # Expires all EssenceSelect content editor cache fragments.
-    def expire_contents_displayed_as_select(page)
-      return unless page.urlname_changed? || page.name_changed?
+    def expire_contents_displayed_as_select
       Content.essence_selects.each { |content| expire_fragment(content) }
     end
 

data/app/sweepers/alchemy/pages_sweeper.rb

@@ -17,15 +17,15 @@ module Alchemy
       end
     end
 
-    private
+  private
 
     def check_multipage_elements(page)
       page.elements.each do |element|
         # are their pages beneath mine?
         if !element.to_be_sweeped_pages.detect { |p| p != page }.nil?
           # yepp! there are more pages then mine
-          pages = element.to_be_sweeped_pages.find_all_by_public_and_locked(true, false)
-          if !pages.blank?
+          pages = element.to_be_sweeped_pages.published.where(:locked => false)
+          if pages.any?
             # expire current page, even if it's locked
             pages.push(page).each do |page|
               expire_page(page)
@@ -37,23 +37,7 @@ module Alchemy
 
     def expire_page(page)
       return if page.do_not_sweep
-      # TODO: We should change this back to expire_action after Rails 3.2 was released.
-      # expire_action(
-      # alchemy.show_page_url(
-      #     :urlname => page.urlname_was,
-      #     :lang => multi_language? ? page.language_code : nil
-      #   )
-      # )
-      # Temporarily fix for Rails 3 bug
-      return if alchemy.nil?
-      expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
-        self,
-        alchemy.show_page_url(
-          :urlname => page.urlname_was,
-          :lang => multi_language? ? page.language_code : nil
-        ),
-        false
-      ).path)
+      expire_action(page.cache_key)
     end
 
   end

data/app/views/alchemy/admin/contents/create.js.coffee

@@ -0,0 +1,49 @@
+<% if params[:was_missing] %>
+
+$("#element_<%= @element.id %>_content_missing").replaceWith('<%= escape_javascript(
+  render(
+    :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+    :locals => @locals
+  )
+) %>')
+
+<% else %>
+
+$("<%= @content_dom_id %>").before('<%= escape_javascript(
+  render(
+    :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+    :locals => @locals
+  )
+) %>')
+Alchemy.enableButton('.disabled.button')
+Alchemy.overlayObserver('#<%= content_dom_id(@content) %>')
+
+<% end %>
+
+<% if @content.essence_type == "Alchemy::EssencePicture" %>
+
+$('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click')
+
+<% if @contents_of_this_type.length > 1 %>
+$('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('dragable_picture')
+<% end %>
+
+<% if !max_image_count.blank? && @contents_of_this_type.length >= max_image_count %>
+$("#add_content_<%= @element.id %>").remove()
+<% end %>
+
+Alchemy.SortableContents('#element_<%= @element.id %>_contents', '<%= form_authenticity_token %>')
+
+<% elsif @content.essence_type == "Alchemy::EssenceDate" %>
+
+Alchemy.Datepicker('#element_<%= @element.id %> input.date')
+
+<% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
+
+Alchemy.Tinymce.addEditor('contents_content_<%= @content.id %>_body')
+
+<% end %>
+
+Alchemy.reloadPreview()
+Alchemy.closeCurrentWindow()
+Alchemy.SelectBox("#element_<%= @element.id %> select.alchemy_selectbox")

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

@@ -0,0 +1,30 @@
+var $el;
+<% if @cutted_element_id %>
+$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
+<% end %>
+
+<% if @page.can_have_cells? %>
+Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>');
+<% end %>
+
+$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
+$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
+Alchemy.growl('<%= t("successfully_added_element") -%>');
+Alchemy.closeCurrentWindow();
+
+<% @element.contents.essence_richtexts.each do |content| %>
+Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
+<% end %>
+
+Alchemy.PreviewWindow.refresh();
+Alchemy.ElementEditorSelector.init();
+
+$el = $('#element_<%= @element.id -%>');
+$el.trigger('Alchemy.SelectElementEditor');
+Alchemy.GUI.initElement($el);
+
+<% if @clipboard.blank? %>
+$('#clipboard_button .icon.clipboard').removeClass('full');
+<% end %>
+
+<%=raw update_elements_with_essence_selects(@page, @element) %>

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

@@ -1,15 +1,14 @@
-(function($) {
+$('#element_<%= @element.id %>').hide(200, function() {
+  $(this).remove();
+  Alchemy.growl('<%= escape_javascript(t("Element trashed")) %>');
+  $('#element_area').sortable('refresh');
+  Alchemy.refreshTrashWindow(<%= @page.id %>);
+  $('#element_trash_button .icon').addClass('full');
+  Alchemy.PreviewWindow.refresh();
 
-  $('#element_<%= @element.id -%>').hide(200, function() {
-    $(this).remove();
-    Alchemy.growl('<%= escape_javascript(t("Element trashed")) -%>');
-    $('#element_area').sortable('refresh');
-    Alchemy.refreshTrashWindow(<%= @page_id -%>);
-    $('#element_trash_button .icon').addClass('full');
-    Alchemy.PreviewWindow.refresh();
-  <%- @element.rtf_contents.each do |content| -%>
-    tinymce.get('contents_content_<%= content.id -%>_body').remove();
-  <%- end -%>
-  });
+  <% @element.contents.essence_richtexts.each do |content| %>
+  tinymce.get('contents_content_<%= content.id %>_body').remove();
+  <% end %>
 
-})(jQuery);
+  <%=raw update_elements_with_essence_selects(@page, @element) %>
+});

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

@@ -1,27 +1,24 @@
-(function($) {
+var $el = $('#element_<%= @element.id %>');
+<% if @element_validated %>
 
-  var $el = $('#element_<%= @element.id -%>');
+$('div.element_handle span.icon', $el).removeClass('element_<%= @element.public? ? "draft" : "public" %>').addClass('element_<%= @element.public? ? "public" : "draft" %>');
+$('.element_heading .preview_text_element_name', $el).html('<%= @element.display_name %>');
+$('.element_heading .preview_text_quote', $el).html('<%= escape_javascript(@element.preview_text) %>');
+$('div.content_editor').removeClass('validation_failed');
+$("#element_<%= @element.id %>_errors").hide();
+Alchemy.setElementSaved($el);
+Alchemy.growl('<%= t("element_saved") %>');
+Alchemy.PreviewWindow.refresh();
 
-  <%- if @element_validated -%>
+<%=raw update_elements_with_essence_selects(@page, @element) %>
 
-  $('div.element_handle span.icon', $el).removeClass('element_<%= @element.public? ? "draft" : "public" -%>').addClass('element_<%= @element.public? ? "public" : "draft" -%>');
-  $('.element_heading .preview_text_element_name', $el).text('<%= @element.display_name -%>');
-  $('.element_heading .preview_text_quote', $el).text('<%= escape_javascript(@element.preview_text) -%>');
-  $('div.content_editor').removeClass('validation_failed');
-  $("#element_<%= @element.id -%>_errors").hide();
-  Alchemy.setElementSaved($el);
-  Alchemy.growl('<%= t("element_saved") -%>');
-  Alchemy.PreviewWindow.refresh();
+<% else %>
 
-  <%- else -%>
+Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
+$('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @element.essence_error_messages.join("</li><li>").html_safe %></li></ul>');
+$("#element_<%= @element.id %>_errors").show();
+$('div.content_editor').removeClass('validation_failed');
+$('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
+Alchemy.enableButton('button.button', $el);
 
-  Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
-  $('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @element.essence_error_messages.join("</li><li>").html_safe %></li></ul>');
-  $("#element_<%= @element.id %>_errors").show();
-  $('div.content_editor').removeClass('validation_failed');
-  $('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
-  Alchemy.enableButton('button.button', $el);
-  
-  <%- end -%>
-
-})(jQuery);
+<% end %>

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

@@ -0,0 +1,30 @@
+(function() {
+<% if @while_page_edit %>
+
+  Alchemy.reloadPreview();
+  $('#page_<%= @page.id %>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
+
+<% else %>
+
+  var $page;
+  $('#page_<%= @page.id %>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
+  $page = $('#page_<%= @page.id %>');
+  Alchemy.overlayObserver($page);
+
+  <% if @page.locked? && @page.locker == current_user %>
+    $('#locked_page_<%= @page.id %> > a').html('<%= @page.name -%>');
+  <% end %>
+
+  <% if @page.restricted? %>
+    $('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted');
+  <% elsif @page.redirects_to_external? %>
+    $('span.redirect_url', $page).html('&raquo; <%= t("Redirects to") %>: <%= h @page.urlname %>');
+  <% else %>
+    $('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted');
+  <% end %>
+
+<% end %>
+
+  Alchemy.closeCurrentWindow();
+  Alchemy.growl("<%= @notice -%>");
+})()

data/app/views/alchemy/admin/users/_user.html.erb

@@ -8,6 +8,7 @@
   <td><%= user.lastname -%></td>
   <td class="email"><%= user.email %></td>
   <td><%= t(user.language, :scope => 'translations') %></td>
+  <td><%= user.last_login_at.present? ? l(user.last_login_at, :format => :default) : t(:unknown) %></td>
   <td class="role"><%= user.human_role_name %></td>
   <td class="tools">
     <%- permitted_to?(:destroy, :alchemy_admin_users) do -%>

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

@@ -23,6 +23,7 @@
     <th><%= Alchemy::User.human_attribute_name('lastname') %></th>
     <th class="email"><%= Alchemy::User.human_attribute_name('email') %></th>
     <th><%= Alchemy::User.human_attribute_name('language') %></th>
+    <th><%= Alchemy::User.human_attribute_name('last_login_at') %></th>
     <th class="role"><%= Alchemy::User.human_attribute_name('role') %></th>
     <th class="tools"></th>
   </tr>

data/app/views/alchemy/essences/_essence_select_editor.html.erb

@@ -1,5 +1,5 @@
 <% cache(content) do %>
-  <div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
+  <div class="content_editor essence_select<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
 
   <%= label_and_remove_link(content) %>
 

data/config/locales/alchemy.de.yml

@@ -766,6 +766,7 @@ de:
         gender: "Anrede"
         language: "Sprache"
         lastname: "Nachname"
+        last_login_at: "letzter Login am"
         login: "Benutzername"
         name: "Name"
         password: "Passwort"

data/config/locales/alchemy.en.yml

@@ -558,6 +558,7 @@ en:
         gender: "Gender"
         language: "Language"
         lastname: "Lastname"
+        last_login_at: "Last Login At"
         login: "Username"
         name: "Name"
         password: "Password"

data/lib/alchemy/upgrader.rb

@@ -105,7 +105,6 @@ module Alchemy
         else
           log "No essence_type columns to be namespaced found.", :skip
         end
-        todo "Test mich nicht"
       end
 
       def strip_alchemy_from_schema_version_table
@@ -113,7 +112,6 @@ module Alchemy
         database_yml = YAML.load_file(Rails.root.join("config", "database.yml"))
         connection = Mysql2::Client.new(database_yml.fetch(Rails.env.to_s).symbolize_keys)
         connection.query "UPDATE schema_migrations SET `schema_migrations`.`version` = REPLACE(`schema_migrations`.`version`,'-alchemy','')"
-        todo "Teste mich"
       end
 
       def convert_essence_texts_displayed_as_select_into_essence_selects