locomotivecms 4.0.3 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672ca536536dc4908f0b030a252694762d02434416aec61a8e6d0e1986b5b832
-  data.tar.gz: 1efea0ba4eb61120459bb3f46c2ac7d31b8b8c0ef987331981f93ab19de79d28
+  metadata.gz: 9ac2bdf950937bd4a07418b142bb21eea251c24db4b5682b8412a9c718374343
+  data.tar.gz: 1546625baf49879c2c70209e5f3df46f0290b689f28c141135e8d52019c3b065
 SHA512:
-  metadata.gz: b5a7cae22c14e129b85db97c40d2f767c2f09cac7c23f74d0bbd9d5691ef083bd18f7d307d6ed006b343c14cd58f7f3ffbdc732eda3f714c6bdabf8a4d4f96e0
-  data.tar.gz: ebb9837c7b16a9d26527f7019112297507b9105124d409cf31757f8bb075c1060ef97cc3e3855988376c56a2193b0b321db1b6a072da1f10b1f06c8c665256a5
+  metadata.gz: d2e672fcec21c3eecba19c80fc7d1bc35f56488d57bc59f43cd2cde49946e71f900b826bef17c5255037b598f1ce4bdc912623d9b09fc477c95112e1d8ac2380
+  data.tar.gz: 9226f4e89892f1e2d66b6f6b74d71981462f53e4969de3a5b09042316e2de20ac578dc9286165055b87066978b37b6a1883bb6da62f5de26173e603d6f3ba3b6

data/Rakefile

@@ -24,6 +24,9 @@ begin
 rescue LoadError
 end
 
+require 'webdrivers'
+load 'webdrivers/Rakefile'
+
 # === Travis ===
 task :travis do
   puts "Install Yarn packages"

data/app/api/locomotive/api/entities/content_type_entity.rb

@@ -9,7 +9,7 @@ module Locomotive
                 :public_submission_accounts,
                 :public_submission_title_template,
                 :recaptcha_required,
-                :entry_template, :display_settings, :filter_fields
+                :entry_template, :display_settings, :filter_fields, :import_enabled
 
         expose :fields, using: ContentTypeFieldEntity do |content_type, _|
           content_type.ordered_entries_custom_fields || []

data/app/api/locomotive/api/entities/site_entity.rb

@@ -7,7 +7,7 @@ module Locomotive
         expose  :name, :handle, :seo_title, :meta_keywords, :meta_description,
                 :robots_txt, :cache_enabled, :private_access
 
-        expose :locales, :prefix_default_locale, :bypass_browser_locale, :domains, :asset_host, :url_redirections
+        expose :locales, :prefix_default_locale, :bypass_browser_locale, :domains, :asset_host, :url_redirections, :overwrite_same_content_assets
 
         expose :memberships, using: MembershipEntity
 

data/app/api/locomotive/api/forms/content_type_form.rb

@@ -17,7 +17,8 @@ module Locomotive
               :entry_template,
               :entries_custom_fields_attributes,
               :display_settings,
-              :filter_fields
+              :filter_fields,
+              :import_enabled
 
         # @param [ Site ] the current site, or site to scope to
         def initialize(site, attributes = {})

data/app/api/locomotive/api/forms/site_form.rb

@@ -10,6 +10,7 @@ module Locomotive
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
         attrs :cache_enabled, :cache_control, :cache_vary
         attrs :sections_content
+        attrs :overwrite_same_content_assets
 
         # Make sure locales and domains are in arrays.
         def locales

data/app/api/locomotive/api/helpers/persistence_helper.rb

@@ -118,7 +118,7 @@ module Locomotive
         def setup_singular_getter_method
           self.class.send(:define_method, singular) do
             instance_variable = "@#{singular}"
-            if instance_variable_defined?(instance_variable)
+            if instance_variable_defined?(instance_variable)              
               instance_variable_get(instance_variable)
             else
               if params[:id]

data/app/api/locomotive/api/resources/content_asset_resource.rb

@@ -40,7 +40,13 @@ module Locomotive
           end
           post do
             authorize ContentAsset, :create?
+
             form = form_klass.new(content_asset_params)
+
+            if current_site.overwrite_same_content_assets?
+              self.content_asset = content_assets.by_exact_filename(form.source['filename']).first || content_assets.new
+            end
+          
             persist_from_form(form)
 
             present content_asset, with: entity_klass

data/app/api/locomotive/api/resources/content_type_resource.rb

@@ -70,6 +70,7 @@ module Locomotive
               optional :public_submission_account_emails
               optional :public_submission_title_template
               optional :public_submission_email_attachments
+              optional :import_enabled
             end
           end
           post do
@@ -121,6 +122,7 @@ module Locomotive
               optional :public_submission_title_template
               optional :public_submission_email_attachments
               optional :recaptcha_required
+              optional :import_enabled
             end
           end
           put ':id' do

data/app/api/locomotive/api/resources/current_site_resource.rb

@@ -47,6 +47,7 @@ module Locomotive
               optional :asset_host
               optional :sections_content
               optional :routes
+              optional :overwrite_same_content_assets
             end
           end
           put do
@@ -58,7 +59,6 @@ module Locomotive
             present current_site, with: entity_klass
           end
 
-
           desc "Delete current site"
           delete do
             authorize current_site, :destroy?

data/app/api/locomotive/api/resources/site_resource.rb

@@ -76,6 +76,7 @@ module Locomotive
               optional :asset_host
               optional :sections_content
               optional :routes
+              optional :overwrite_same_content_assets
             end
           end
           post do
@@ -113,11 +114,12 @@ module Locomotive
               optional :asset_host
               optional :sections_content
               optional :routes
+              optional :overwrite_same_content_assets
             end
           end
           put ':id' do
             site = load_site
-            authorize site, :update?
+            authorize site, :update?            
 
             site_form = Forms::SiteForm.new(permitted_params_from_policy(site, :site, [:picture], [:metafields_ui, :metafields_schema, :metafields, :routes, :sections_content]))
             service.update!(site, site_form.serializable_hash)