locomotivecms 4.0.0.alpha2 → 4.0.0.alpha3

data/app/models/locomotive/concerns/content_entry/file_size.rb

@@ -18,7 +18,11 @@ module Locomotive
         private
 
         def sync_file_size
-          self._file_size = self.file_custom_fields.inject(0) { |sum,field| send(field).size + sum }
+          self._file_size = self.file_custom_fields.inject(0) do |sum, field|
+            file = send(field)&.file
+            _size = file&.exists? ? file.size : 0
+            _size + sum
+          end
         end
 
       end

data/app/models/locomotive/concerns/content_type/public_submission_title_template.rb

@@ -13,7 +13,7 @@ module Locomotive
           template = ::Liquid::Template.parse(self.public_submission_title_template, {})
 
           assigns   = { 'site' => self.site, 'entry' => entry }.merge(options)
-          registers = { site: self.site }
+          registers = { site: self.site, services: Locomotive::Steam::Services.build_instance }
 
           template.render(::Liquid::Context.new({}, assigns, registers))
         end

data/app/models/locomotive/concerns/page/sections.rb

@@ -17,6 +17,17 @@ module Locomotive
           json_attribute  :sections_content
         end
 
+        def all_sections_content
+          (self.sections_dropzone_content || []).map.each_with_index do |section, index|
+            # based on the mechanism that Steam uses to generate the anchors
+            _anchor = (section['anchor'] || "dropzone-#{index}") + '-section'
+            section.merge({ 'anchor' => _anchor })
+          end +
+          (self.sections_content || {}).map do |(section_id, section)|
+            section.merge({ 'anchor' => "page-#{section_id}-section" })
+          end
+        end
+
         private
 
         # Example:

data/app/models/locomotive/concerns/site/url_redirections.rb

@@ -11,6 +11,9 @@ module Locomotive
           field :url_redirections, type: Array, default: []
           field :url_redirections_information, type: Hash, default: {}
 
+          ## virtual attributes ##
+          attr_accessor :url_redirections_expert_mode
+
         end
 
         module ClassMethods
@@ -22,6 +25,13 @@ module Locomotive
 
         end
 
+        def url_redirections_plain_text
+          url_redirections
+          .sort { |a, b| a.first <=> b.first }
+          .map { |redirection| redirection.join(' ') }
+          .join("\n")
+        end
+
         def url_redirections_with_information(with_hidden = true)
           url_redirections.map do |(source, target)|
             url_id = Digest::MD5.hexdigest(source)
@@ -67,7 +77,7 @@ module Locomotive
         protected
 
         def add_leading_slash_to(path)
-          path.starts_with?('/') ? path : "/#{path}"
+          path.starts_with?('/') || path =~ /\Ahttps+:\/\// ? path : "/#{path}"
         end
 
       end

data/app/policies/locomotive/membership_policy.rb

@@ -2,7 +2,7 @@ module Locomotive
   class MembershipPolicy < ApplicationPolicy
 
     def index?
-      site_admin?
+      site_admin_or_designer?
     end
 
     def create?
@@ -14,7 +14,7 @@ module Locomotive
     end
 
     def destroy?
-      site_admin? && change_role?
+      site_admin_or_designer? && change_role?
     end
 
     # The role cannot be set higher than the current one (we use the index in
@@ -25,11 +25,7 @@ module Locomotive
     end
 
     def permitted_attributes
-      if site_admin?
-        [:email, :role]
-      else
-        []
-      end
+      [:email, :role]
     end
 
   end

data/app/services/locomotive/content_entry_service.rb

@@ -1,5 +1,5 @@
 module Locomotive
-  class ContentEntryService < Struct.new(:content_type, :account)
+  class ContentEntryService < Struct.new(:content_type, :account, :locale)
 
     include Locomotive::Concerns::ActivityService
 
@@ -85,7 +85,7 @@ module Locomotive
           # send an email to selected local accounts
           send_notifications(entry)
 
-          track_activity 'content_entry.created_public', parameters: activity_parameters(entry)
+          track_activity 'content_entry.created_public', locale: locale, parameters: activity_parameters(entry)
         end
       end
     end
@@ -106,7 +106,7 @@ module Locomotive
         entry.updated_by = account
 
         if entry.save
-          track_activity 'content_entry.updated', parameters: activity_parameters(entry)
+          track_activity 'content_entry.updated', locale: locale, parameters: activity_parameters(entry)
         end
       end
     end
@@ -127,6 +127,24 @@ module Locomotive
       end
     end
 
+    # Destroy all the entries described by their id
+    def bulk_destroy(ids)
+      content_type.entries.where(:_id.in => ids).map do |entry|
+        entry.destroy
+        entry._label
+      end.tap do |labels|
+        track_activity 'content_entry.destroyed_bulk',
+          parameters: activity_parameters.merge(labels: labels)
+      end
+    end
+
+    # Destroy all the entries of a content type.
+    # Runs each entry's destroy callbacks.
+    #
+    def destroy_all
+      content_type.entries.destroy_all
+    end
+
     # Make sure the content entries has a non-blank slug in the new locales.
     # We take the slug in the default locale or the previous default locale (if provided)
     #
@@ -148,13 +166,6 @@ module Locomotive
       end
     end
 
-    # Destroy all the entries of a content type.
-    # Runs each entry's destroy callbacks.
-    #
-    def destroy_all
-      content_type.entries.destroy_all
-    end
-
     def send_notifications(entry)
       return unless self.content_type.public_submission_enabled?
 

data/app/services/locomotive/custom_field_service.rb

@@ -1,5 +1,5 @@
 module Locomotive
-  class CustomFieldService < Struct.new(:field)
+  class CustomFieldService < Struct.new(:field, :locale)
 
     # Update the options of a "select" field.
     #
@@ -10,19 +10,43 @@ module Locomotive
     def update_select_options(options)
       return nil if options.blank?
 
+      default_locale      = field._parent.site.default_locale.to_sym
+      include_new_options = false
+
       # set the right position
       options.each_with_index do |option, position|
         option['position'] = position
+        include_new_options = true if option['_id'].blank?
       end
 
       self.field.select_options_attributes = options
 
+      save_field
+
+      # make sure the new options are also available in the default locale
+      if include_new_options && locale != default_locale
+        ::Mongoid::Fields::I18n.with_locale(default_locale) do
+          self.field.reload.select_options.each do |option|
+            next unless option.attributes[:name][default_locale].blank?
+
+            # force the name in the default locale
+            option.name = option.attributes[:name].values.first
+          end
+        end
+
+        save_field # we have to save it again and that's okay
+      end
+
+      self.field.select_options
+    end
+
+    private
+
+    def save_field
       # save the content type so that all the content entries get a fresh version
       # of the custom fields rules
-      self.field._parent.save
       self.field.save
-
-      self.field.select_options
+      self.field._parent.save
     end
 
   end

data/app/services/locomotive/editable_element_service.rb

@@ -1,5 +1,5 @@
 module Locomotive
-  class EditableElementService < Struct.new(:site, :account)
+  class EditableElementService < Struct.new(:site, :account, :locale)
 
     include Locomotive::Concerns::ActivityService
 
@@ -25,7 +25,7 @@ module Locomotive
 
         save_all_pages(pages.values)
 
-        track_activity 'editable_element.updated_bulk', parameters: {
+        track_activity 'editable_element.updated_bulk', locale: locale, parameters: {
           pages: modified_pages.values.map { |p| { title: p.title, _id: p._id } }
         } unless modified_pages.empty?
       end

data/app/services/locomotive/editor_service.rb

@@ -1,36 +1,21 @@
 module Locomotive
-  class EditorService < Struct.new(:site, :account, :page)
+  class EditorService < Struct.new(:site, :account, :page, :locale)
 
     include Locomotive::Concerns::ActivityService
 
     # Used by the URL picker to retrieve either a page or a content entry.
-    def find_resources(query, max_results = 10)
-      return [] if query.strip.blank?
-
-      (
-        site.pages
-        .only(:_id, :title)
-        .where(title: /#{query}/i, is_layout: false, target_klass_name: nil, :slug.ne => '404')
-        .limit(max_results).map do |page|
-          { type: 'page', value:  page._id, label: ['Pages', page.title] }
-        end
-      ) + (
-        site.pages
-        .only(:_id, :site_id, :target_klass_name)
-        .where(:target_klass_name.ne => nil).map do |page|
-          page.fetch_target_entries(
-            page.content_type.label_field_name => /#{query}/i, _visible: true
-          ).map do |entry|
-            {
-              type:   'content_entry',
-              value:  { content_type_slug: entry.content_type_slug, id: entry._id, page_id: page._id },
-              label:  [entry.content_type.name, entry._label]
-            }
-          end
-        end.flatten
-      )
-      .sort { |a, b| a[:label][1] <=> b[:label][1] }
-      .first(max_results)
+    def find_resources(type, query, scope = nil, max_results = 10)
+      return [] if type.blank? || query.strip.blank?
+
+      case type
+      when 'page'
+        find_pages(query, max_results)
+      when 'content_entry'
+        find_content_entries(scope, query, max_results)
+      else
+        Rails.logger.warn("[EditorService] Unknown type: #{type}")
+        []
+      end
     end
 
     # Save sections for both the current site (global versions) and the page
@@ -42,13 +27,44 @@ module Locomotive
       page_attributes[:sections_dropzone_content] = parse_sections_dropzone_content(page_attributes[:sections_dropzone_content])
       page.update_attributes(page_attributes)
 
-      track_activity 'editable_element.updated_bulk', parameters: {
-        pages: [page].map { |p| { title: p.title, _id: p._id } }
-      }
+      track_activity 'page_content.updated',
+        parameters: { _id: page._id, title: page.title },
+        locale: locale
     end
 
     private
 
+    def find_pages(query, max_results = 10)
+      site.pages
+      .only(:_id, :title, :sections_dropzone_content, :sections_content)
+      .where(is_layout: false, target_klass_name: nil, :slug.ne => '404')
+      .or({ title: /#{query}/i }, { _id: query })
+      .limit(max_results)
+      .sort(title: 1).map do |page|
+        {
+          type:     'page',
+          value:    page._id,
+          label:    ['Page', page.title],
+          sections: page.all_sections_content
+        }
+      end
+    end
+
+    def find_content_entries(scope, query, max_results)
+      content_type = site.content_types.where(slug: scope).first
+      content_type.entries
+      .where(
+        content_type.label_field_name => /#{query}/i, _visible: true
+      )
+      .limit(max_results).map do |entry|
+        {
+          type:   'content_entry',
+          value:  { content_type_slug: scope, id: entry._id },
+          label:  [content_type.name, entry._label]
+        }
+      end
+    end
+
     def parse_sections_content(value)
       return nil if value.nil?
 

data/app/services/locomotive/page_service.rb

@@ -1,6 +1,6 @@
 module Locomotive
 
-  class PageService < Struct.new(:site, :account)
+  class PageService < Struct.new(:site, :account, :locale)
 
     include Locomotive::Concerns::ActivityService
 
@@ -41,7 +41,7 @@ module Locomotive
         page.updated_by = account if account
 
         if page.save
-          track_activity 'page.updated', parameters: { title: page.title, _id: page._id }
+          track_activity 'page.updated', locale: locale, parameters: { title: page.title, _id: page._id }
         end
       end
     end

data/app/services/locomotive/translation_service.rb

@@ -24,6 +24,13 @@ module Locomotive
       end
     end
 
+    def bulk_destroy(ids)
+      site.translations.where(:id.in => ids).map do |translation|
+        translation.destroy
+        translation._id
+      end
+    end
+
     protected
 
     def prepare_keywords_statement(keywords)

data/app/views/locomotive/accounts/new.html.slim

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= help t('.help', default: '')
+- help t('.help', default: '')
 
 = locomotive_form_for @account, url: accounts_path(current_site) do |f|
 

data/app/views/locomotive/content_assets/_list.html.slim

@@ -22,6 +22,11 @@
                 span= asset_text(asset)
 
         .actions
+          - if asset.source&.url
+            = link_to asset.source.url, class: 'btn btn-primary btn-sm', target: '_blank' do
+              i.fas.fa-download
+            |  
+
           - if enable_select
             = link_to t('.buttons.select'), asset.source.url, class: 'btn btn-primary btn-sm select', title: asset_filename(asset), data: { image: asset.image? }
             |  

data/app/views/locomotive/content_assets/_search_form.html.slim

@@ -1,5 +1,5 @@
 = form_tag content_assets_path(current_site), method: 'GET', remote: remote do
   = hidden_field_tag :types, params[:types] if params[:types]
   .form-group
-    = text_field_tag :query, params[:query], placeholder: t('.placeholder'), class: 'form-control'
     i.fa.fa-search.icon
+    = text_field_tag :query, params[:query], placeholder: t('.placeholder'), class: 'form-control'

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

@@ -24,9 +24,9 @@
             == document_stamp(entry)
 
         .actions
-          = link_to content_entry_path(current_site, content_type.slug, entry), title: t(:delete, scope: 'simple_form.buttons.defaults.locomotive'), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete do
-            i.far.fa-trash-alt
-
+          .checkbox
+            = check_box_tag "item_#{entry._id}", entry._id
+            = label_tag "item_#{entry._id}", ''
 
 - if entries.respond_to?(:current_page)
   .text-center

data/app/views/locomotive/content_entries/edit.html.slim

@@ -1,6 +1,6 @@
 - title t('.title', type: @content_type.name.capitalize)
 
-= help @content_type.description
+- help @content_type.description
 
 - content_for :actions do
   - if @content_type.localized?
@@ -11,6 +11,7 @@
 
 = locomotive_form_for @content_entry, as: :content_entry, url: content_entry_path(current_site, @content_type.slug, @content_entry), html: { multipart: true, novalidate: true } do |f|
 
+  = hidden_field_tag :content_locale, current_content_locale
   = hidden_field_tag :active_tab, ''
   = hidden_field_tag :_location,  params[:_location]
 

data/app/views/locomotive/content_entries/index.html.slim

@@ -1,55 +1,68 @@
 - title t('.title', type: @content_type.name.capitalize)
+- help @content_type.description
 
 - content_for :actions do
   - if @content_type.localized?
     = locale_picker_link
 
-  - if can_edit_public_submission_accounts?(@content_type)
-    = link_to edit_public_submission_accounts_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm' do
-      i.fa.fa-pencil
-      |  
-      = t('.edit_notification_settings')
-
-  = link_to new_content_entry_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm' do
-    i.fa.fa-plus
-    |  
-    = t('.new')
-
-- if @content_type.filter_fields.present?
-  .row
-    .col-md-6
-      = help @content_type.description
-    .col-md-6
+  .bulk-destroy-action.hidden
+    = form_tag bulk_destroy_content_entries_path(current_site, @content_type.slug, page: params[:page] || 1), method: :delete do
+      = hidden_field_tag 'ids', ''
+      = button_tag type: 'submit', class: 'btn btn-primary btn-sm', data: { confirm: t('locomotive.messages.confirm') } do
+        i.far.fa-trash-alt
+        |  
+        = t('.bulk_destroy')
+
+  .main-action
+    .btn-group
+      = link_to new_content_entry_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm' do
+        i.fa.fa-plus
+        |  
+        = t('.new')
+      button.btn.btn-primary.btn-sm.dropdown-toggle data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+        span.caret
+        span.sr-only Toggle Dropdown
+      ul.dropdown-menu.dropdown-menu-right
+        - if can_edit_public_submission_accounts?(@content_type)
+          li
+            = link_to edit_public_submission_accounts_path(current_site, @content_type.slug) do
+              i.fas.fa-cog
+              = t('.edit_notification_settings')
+
+        - unless empty_collection?(@content_entries)
+          li
+            = link_to export_content_entries_path(current_site, @content_type.slug, :csv) do
+              i.fa.fa-download
+              = t('.download')
+
+- if @content_type.groupable?
+  .row.list-groups
+    .nav-container
+      ul.nav.nav-tabs role='tablist'
+        li class="#{'active' if params[:group].nil?}"
+          = link_to t('.group_by.all'), content_entries_path(current_site, @content_type.slug, query: params[:query])
+
+        - each_content_entry_group(@content_type) do |group|
+          li class="#{'active' if params[:group] == group[:name]}"
+            = link_to group[:name], group[:url]
+
+.row.list-header
+  .col.col-md-6.text-left
+    - if @content_type.filter_fields.present?
       .search-bar
         = form_tag content_entries_path(current_site, @content_type.slug), method: :get do
           .form-group
             = hidden_field_tag :group, params[:group]
             = hidden_field_tag :where, params[:where]
-            = text_field_tag :q, params[:q], placeholder: t('.search_placeholder'), class: 'form-control'
             i.fa.fa-search.icon
+            = text_field_tag :q, params[:q], placeholder: t('.search_placeholder'), class: 'form-control'
+    - else
+      p
 
-- else
-  = help @content_type.description
-
-- if @content_type.groupable?
-  .nav-container
-    ul.nav.nav-tabs role='tablist'
-      li class="#{'active' if params[:group].nil?}"
-        = link_to t('.group_by.all'), content_entries_path(current_site, @content_type.slug, query: params[:query])
-
-      - each_content_entry_group(@content_type) do |group|
-        li class="#{'active' if params[:group] == group[:name]}"
-          = link_to group[:name], group[:url]
+  .col.col-md-6.text-right
+    - unless empty_collection?(@content_entries)
+      .checkbox
+        = check_box_tag 'all_entries', 1, false, class: 'list-main-checkbox'
+        = label_tag 'all_entries', ''
 
 = render 'list', content_type: @content_type, entries: @content_entries
-
-- unless empty_collection?(@content_entries)
-  .row
-    .col-md-12
-      br
-      p.text-right
-        = link_to export_content_entries_path(current_site, @content_type.slug, :csv), class: 'btn btn-primary btn-sm' do
-          i.fa.fa-download
-          |  
-          = t('.download')
-