locomotive_cms 2.3.1 → 2.4.0

data/app/models/locomotive/content_entry.rb

@@ -5,8 +5,9 @@ module Locomotive
 
     ## extensions ##
     include ::CustomFields::Target
-    include Extensions::Shared::Seo
     include Extensions::ContentEntry::Csv
+    include Extensions::ContentEntry::Localized
+    include Extensions::Shared::Seo
 
     ## fields ##
     field :_slug,             localize: true
@@ -33,6 +34,7 @@ module Locomotive
     ## named scopes ##
     scope :visible, where(_visible: true)
     scope :latest_updated, order_by(updated_at: :desc).limit(Locomotive.config.ui[:latest_entries_nb])
+    scope :next_or_previous, ->(condition, order_by) { where({ _visible: true }.merge(condition)).limit(1).order_by(order_by) }
 
     ## methods ##
 
@@ -59,41 +61,6 @@ module Locomotive
 
     alias :to_label :_label
 
-    # Tell if the content entry has been translated or not.
-    # It just checks if the field used for the label has been translated.
-    # It assumes the entry is localized.
-    #
-    # @return [ Boolean ] True if translated, false otherwise
-    #
-    def translated?
-      if self.respond_to?(:"#{self._label_field_name}_translations")
-        self.send(:"#{self._label_field_name}_translations").key?(::Mongoid::Fields::I18n.locale.to_s) #rescue false
-      else
-        true
-      end
-    end
-
-    # Return the locales the content entry has been translated to.
-    #
-    # @return [ Array ] The list of locales. Nil if not localized
-    #
-    def translated_in
-      if self.localized?
-        self.send(:"#{self._label_field_name}_translations").keys
-      else
-        nil
-      end
-    end
-
-    # Tell if the entry is localized or not, meaning if the label field
-    # is localized or not.
-    #
-    # @return [ Boolean ] True if localized, false otherwise
-    #
-    def localized?
-      self.respond_to?(:"#{self._label_field_name}_translations")
-    end
-
     # Return the next content entry based on the order defined in the parent content type.
     #
     # @param [ Object ] The next content entry or nil if not found
@@ -123,13 +90,14 @@ module Locomotive
     # Sort the content entries from an ordered array of content entry ids.
     # Their new positions are persisted.
     #
+    # @param [ Array ] content_type The content type describing the entries
     # @param [ Array ] The ordered array of ids
     #
-    def self.sort_entries!(ids)
+    def self.sort_entries!(ids, column = :_position)
       list = self.any_in(_id: ids.map { |id| Moped::BSON::ObjectId.from_string(id.to_s) }).to_a
       ids.each_with_index do |id, position|
         if entry = list.detect { |e| e._id.to_s == id.to_s }
-          entry.update_attributes _position: position
+          entry.update_attributes column => position
         end
       end
     end
@@ -162,11 +130,13 @@ module Locomotive
     # @return [ Object ] The next or previous content entry or nil if none
     #
     def next_or_previous(matcher = :gt)
-      order_by  = self.content_type.order_by_definition(matcher == :lt)
-      criterion = self.content_type.order_by_attribute.to_sym.send(matcher)
-      value     = self.send(self.content_type.order_by_attribute.to_sym)
+      attribute, direction = self.content_type.order_by_definition(matcher == :lt)
+
+      criterion = attribute.to_sym.send(matcher)
+      value     = self.send(attribute.to_sym)
+      order_by  = [attribute, direction]
 
-      self.class.where(criterion => value).order_by(:order_by.asc).limit(1).first
+      self.class.next_or_previous({ criterion => value }, order_by).first
     end
 
     # Set the slug of the instance by using the value of the highlighted field
@@ -176,10 +146,7 @@ module Locomotive
       self._slug = self._label.dup if self._slug.blank? && self._label.present?
 
       if self._slug.present?
-        # if the slug includes one "_" at least, we consider that the "_" is used instead of "-".
-        underscore = !self._slug.index('_').nil?
-
-        self._slug.permalink!(underscore)
+        self._slug.permalink!
 
         self._slug = self.next_unique_slug if self.slug_already_taken?
       end
@@ -239,8 +206,10 @@ module Locomotive
     def send_notifications
       return if !self.content_type.public_submission_enabled? || self.content_type.public_submission_accounts.blank?
 
+      account_ids = self.content_type.public_submission_accounts.map(&:to_s)
+
       self.site.accounts.each do |account|
-        next unless self.content_type.public_submission_accounts.map(&:to_s).include?(account._id.to_s)
+        next unless account_ids.include?(account._id.to_s)
 
         Locomotive::Notifications.new_content_entry(account, self).deliver
       end

data/app/models/locomotive/content_type.rb

@@ -109,9 +109,19 @@ module Locomotive
       self.find_entries_custom_field(self.group_by_field_id)
     end
 
+    def sortable_column
+      # only the belongs_to field has a special column for relative positionning
+      # that's why we don't call groupable?
+      if self.group_by_field.try(:type) == 'belongs_to' && self.order_manually?
+        "position_in_#{self.group_by_field.name}"
+      else
+        '_position'
+      end
+    end
+
     def list_or_group_entries(options = {})
       if self.groupable?
-        if group_by_field.type == 'select'
+        if self.group_by_field.type == 'select'
           self.entries.group_by_select_option(self.group_by_field.name, self.order_by_definition)
         else
           group_by_belongs_to_field(self.group_by_field)
@@ -201,8 +211,14 @@ module Locomotive
     end
 
     def order_by_attribute
-      return self.order_by if %w(created_at updated_at _position).include?(self.order_by)
-      self.entries_custom_fields.find(self.order_by).name rescue 'created_at'
+      case self.order_by
+      when '_position'
+        self.sortable_column
+      when 'created_at', 'updated_at'
+        self.order_by
+      else
+        self.entries_custom_fields.find(self.order_by).name rescue 'created_at'
+      end
     end
 
     def normalize_slug

data/app/models/locomotive/editable_text.rb

@@ -35,6 +35,8 @@ module Locomotive
     def copy_attributes_from(el)
       super(el)
 
+      self.copy_formatting_attributes_from(el)
+
       self.attributes['content']          = el.content_translations || {}
       self.attributes['default_content']  = el.default_content_translations
     end
@@ -42,8 +44,12 @@ module Locomotive
     def copy_default_attributes_from(el)
       super(el)
 
+      self.copy_formatting_attributes_from(el)
+    end
+
+    def copy_formatting_attributes_from(el)
       %w(format rows line_break).each do |attr|
-        self.send(:"#{attr}=", el.send(attr.to_sym))
+        self.attributes[attr] = el.attributes[attr]
       end
     end
 

data/app/models/locomotive/extensions/content_entry/localized.rb

@@ -0,0 +1,62 @@
+module Locomotive
+  module Extensions
+    module ContentEntry
+      module Localized
+
+        # Tell if the content entry has been translated or not.
+        # It just checks if the field used for the label has been translated.
+        # It assumes the entry is localized.
+        #
+        # @return [ Boolean ] True if translated, false otherwise
+        #
+        def translated?
+          if self.respond_to?(:"#{self._label_field_name}_translations")
+            self.send(:"#{self._label_field_name}_translations").key?(::Mongoid::Fields::I18n.locale.to_s) #rescue false
+          else
+            true
+          end
+        end
+
+        # Return the locales the content entry has been translated to.
+        #
+        # @return [ Array ] The list of locales. Nil if not localized
+        #
+        def translated_in
+          if self.localized?
+            self.send(:"#{self._label_field_name}_translations").keys
+          else
+            nil
+          end
+        end
+
+        # Tell if the field of the content entry has been translated
+        # in the current locale or not.
+        #
+        # @param [ String/Object ] field The field or the name of the field
+        #
+        # @return [ Boolean ] True if translated, false if not, nil if the field is not localized
+        #
+        def translated_field?(field_or_name)
+          field = field_or_name.respond_to?(:name) ? field_or_name : self.fields[field_or_name.to_s]
+
+          if field.try(:localized?)
+            locale = ::Mongoid::Fields::I18n.locale.to_s
+            (self.attributes[field.name] || {}).key?(locale)
+          else
+            nil
+          end
+        end
+
+        # Tell if the entry is localized or not, meaning if the label field
+        # is localized or not.
+        #
+        # @return [ Boolean ] True if localized, false otherwise
+        #
+        def localized?
+          self.respond_to?(:"#{self._label_field_name}_translations")
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/extensions/page/tree.rb

@@ -15,6 +15,7 @@ module Locomotive
 
           ## callbacks ##
           before_save     :persist_depth
+          before_save     :ensure_index_position
           before_destroy  :delete_descendants
 
           ## indexes ##
@@ -140,6 +141,10 @@ module Locomotive
           self.depth = self.parent_ids.count
         end
 
+        def ensure_index_position
+          self.position = 0 if self.index?
+        end
+
       end
     end
   end

data/app/models/locomotive/extensions/shared/slug.rb

@@ -0,0 +1,33 @@
+module Locomotive
+  module Extensions
+    module Shared
+      module Slug
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          def slugify_from(field)
+            class_eval <<-EOV
+              before_validation { |object| object.send(:normalize_slug, :#{field.to_s}) }
+            EOV
+          end
+        end
+
+        protected
+
+        def normalize_slug(field)
+          value = self.send(field)
+
+          if self.slug.blank? && value.present?
+            self.slug = value.clone
+          end
+
+          if self.slug.present?
+            self.slug.permalink!
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/page.rb

@@ -13,6 +13,7 @@ module Locomotive
     include Extensions::Page::Templatized
     include Extensions::Page::Redirect
     include Extensions::Page::Listed
+    include Extensions::Shared::Slug
     include Extensions::Shared::Seo
 
     ## fields ##
@@ -34,9 +35,11 @@ module Locomotive
     index parent_id:  1
     index fullpath:   1, site_id: 1
 
+    ## behaviours ##
+    slugify_from        :title
+
     ## callbacks ##
     after_initialize    :set_default_raw_template
-    before_validation   :normalize_slug
     before_save         :build_fullpath
     before_save         :record_current_locale
     before_destroy      :do_not_remove_index_and_404_pages
@@ -104,16 +107,6 @@ module Locomotive
       self.errors.empty?
     end
 
-    def normalize_slug
-      self.slug = self.title.clone if self.slug.blank? && self.title.present?
-      if self.slug.present?
-        # if the slug includes one "_" at least, we consider that the "_" is used instead of "-".
-        underscore = !self.slug.index('_').nil?
-
-        self.slug.permalink!(underscore)
-      end
-    end
-
     def set_default_raw_template
       self.raw_template ||= ::I18n.t('attributes.defaults.pages.other.body')
     end

data/app/models/locomotive/snippet.rb

@@ -2,6 +2,7 @@ module Locomotive
   class Snippet
 
     include Locomotive::Mongoid::Document
+    include Extensions::Shared::Slug
 
     ## fields ##
     field :name
@@ -12,7 +13,6 @@ module Locomotive
     belongs_to :site, class_name: 'Locomotive::Site'
 
     ## callbacks ##
-    before_validation :normalize_slug
     after_save        :update_templates
     after_destroy     :update_templates
 
@@ -21,6 +21,7 @@ module Locomotive
     validates_uniqueness_of :slug, scope: :site_id
 
     ## behaviours ##
+    slugify_from    :name
     attr_protected  :id
     attr_accessible :name, :slug, :template
 
@@ -28,11 +29,6 @@ module Locomotive
 
     protected
 
-    def normalize_slug
-      self.slug = self.name.clone if self.slug.blank? && self.name.present?
-      self.slug.permalink!(true) if self.slug.present?
-    end
-
     def update_templates
       return unless (self.site rescue false) # not run if the site is being destroyed
 
@@ -54,7 +50,7 @@ module Locomotive
     def _change_snippet_inside_template(node)
       case node
       when Locomotive::Liquid::Tags::Snippet
-        node.refresh(self) if node.slug == self.slug
+        node.refresh(self, _default_context) if node.slug == self.slug
       when Locomotive::Liquid::Tags::InheritedBlock
         _change_snippet_inside_template(node.parent) if node.parent
       end
@@ -66,5 +62,8 @@ module Locomotive
       end
     end
 
+    def _default_context
+      { site: site }
+    end
   end
 end

data/app/models/locomotive/translation.rb

@@ -29,10 +29,10 @@ class Locomotive::Translation
   #
   def underscore_key
     if self.key
-      self.key = self.key.permalink.underscore
+      self.key = self.key.permalink(true)
     end
   end
-  
+
   def remove_blanks
     self.values.delete_if { |k,v| v.blank? }
   end

data/app/presenters/locomotive/account_presenter.rb

@@ -2,7 +2,7 @@ module Locomotive
   class AccountPresenter < BasePresenter
 
     ## properties ##
-    properties  :name, :email, :locale
+    properties  :name, :email, :locale, :encrypted_password, :password_salt
     property    :admin, only_getter: true
 
     with_options only_setter: true do |presenter|

data/app/views/locomotive/content_entries/_list.html.haml

@@ -1,10 +1,12 @@
 - if entries.empty?
   %p.no-items!= t('.no_items', url: new_content_entry_path(content_type.slug))
 - else
-  %ul{ id: 'entries-list', class: "#{'list' unless content_type.groupable?} #{'sortable' if content_type.order_manually?}", :'data-url' => sort_content_entries_path(content_type.slug, :json) }
+  %ul{ id: 'entries-list', class: "#{content_type.groupable? ? 'grouped' : 'list'} #{'sortable' if content_type.order_manually?}", :'data-url' => sort_content_entries_path(content_type.slug, :json) }
     - entries.each do |entry|
       %li.item{ id: "entry-#{entry._id}" }
         %span.handle
+          - if content_type.groupable?
+            %i.icon-reorder
 
         %strong= link_to entry_label(content_type, entry), edit_content_entry_path(content_type.slug, entry)
 

data/app/views/locomotive/custom_fields/types/_boolean.html.haml

@@ -1,4 +1,4 @@
 = f.input name,
-  label:  field.label,
+  label:  label_for_custom_field(f.object, field),
   hint:   field.hint,
   as:     :'Locomotive::Toggle'

data/app/views/locomotive/custom_fields/types/_date.html.haml

@@ -1,5 +1,5 @@
 = f.input :"formatted_#{name}",
-  label:        field.label,
+  label:        label_for_custom_field(f.object, field),
   hint:         field.hint,
   wrapper_html: { class: 'date' },
   input_html:   { maxlength: 10 }

data/app/views/locomotive/custom_fields/types/_date_time.html.haml

@@ -1,5 +1,5 @@
 = f.input :"formatted_#{name}",
-  label:        field.label,
+  label:        label_for_custom_field(f.object, field),
   hint:         field.hint,
   wrapper_html: { class: 'date-time' },
   input_html:   { maxlength: 10 }

data/app/views/locomotive/custom_fields/types/_email.html.haml

@@ -1,4 +1,4 @@
 = f.input name,
-  label:        field.label,
+  label:        label_for_custom_field(f.object, field),
   hint:         field.hint,
   wrapper_html: { class: "#{'highlighted' if highlighted}" }