Merge branch 'master' into 0000-docker

6 files changed, 64 insertions, 5 deletions

diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 69204a5d7..2d06fb88b 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -39,6 +39,7 @@ Apartment.configure do |config|
     'Chouette::Network',
     'ReferentialCloning',
     'Workbench',
+    'Workgroup',
     'CleanUp',
     'CleanUpResult',
     'Calendar',
@@ -77,7 +78,9 @@ Apartment.configure do |config|
     'ComplianceCheckSet',
     'ComplianceCheckBlock',
     'ComplianceCheckResource',
-    'ComplianceCheckMessage'
+    'ComplianceCheckMessage',
+    'Merge',
+    'CustomField',
   ]
 
   # use postgres schemas?
diff --git a/config/initializers/apartment_null_db.rb b/config/initializers/apartment_null_db.rb
new file mode 100644
index 000000000..438f1e58b
--- /dev/null
+++ b/config/initializers/apartment_null_db.rb
@@ -0,0 +1,25 @@
+if ENV['RAILS_DB_ADAPTER'] == 'nulldb'
+  require 'apartment/adapters/abstract_adapter'
+
+  module Apartment
+    module Tenant
+      def adapter
+        Thread.current[:apartment_adapter] ||= nulldb_adapter(config)
+      end
+
+      def self.nulldb_adapter(config)
+        adapter = Adapters::NulldbAdapter
+        adapter.new(config)
+      end
+    end
+
+    module Adapters
+      # Default adapter when not using Postgresql Schemas
+      class NulldbAdapter < AbstractAdapter
+        def initialize config
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/config/initializers/countries.rb b/config/initializers/countries.rb
new file mode 100644
index 000000000..7f2b5c9db
--- /dev/null
+++ b/config/initializers/countries.rb
@@ -0,0 +1,3 @@
+ISO3166.configure  do |config|
+  config.locales = (I18n.available_locales + Chouette::StopArea::AVAILABLE_LOCALIZATIONS).uniq
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 724aaecc5..2f65b8800 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -13,3 +13,9 @@ end
 Sidekiq.configure_client do |config|
   config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://localhost:6379/12') }
 end
+
+Sidekiq.configure_client do |config|
+  config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://localhost:6379/12') }
+end
+
+Sidekiq.default_worker_options = { retry: false }
diff --git a/config/initializers/simple_form/safe_submit.rb b/config/initializers/simple_form/safe_submit.rb
new file mode 100644
index 000000000..64b9f1e6e
--- /dev/null
+++ b/config/initializers/simple_form/safe_submit.rb
@@ -0,0 +1,12 @@
+::SimpleForm::FormBuilder.class_eval do
+  def button_with_safe_submit(type, *args, &block)
+    options = args.extract_options!.dup
+    if type == :submit
+      options[:data] ||= {}
+      options[:data][:disable_with] ||= I18n.t('actions.wait_for_submission')
+    end
+    args << options
+    button_without_safe_submit type, *args, &block
+  end
+  alias_method_chain :button, :safe_submit
+end
diff --git a/config/initializers/stif.rb b/config/initializers/stif.rb
index eb918131b..a73e4931b 100644
--- a/config/initializers/stif.rb
+++ b/config/initializers/stif.rb
@@ -1,12 +1,22 @@
+# coding: utf-8
 Rails.application.config.to_prepare do
   Organisation.after_create do |organisation|
     line_referential      = LineReferential.find_by(name: "CodifLigne")
     stop_area_referential = StopAreaReferential.find_by(name: "Reflex")
 
-    organisation.workbenches.find_or_create_by(name: "Gestion de l'offre") do |workbench|
-      workbench.line_referential      = line_referential
-      workbench.stop_area_referential = stop_area_referential
-      workbench.objectid_format = Workbench.objectid_format.stif_netex
+    line_referential.organisations << organisation
+    stop_area_referential.organisations << organisation
+
+    workgroup = Workgroup.find_or_create_by(name: "Gestion de l'offre théorique IDFm") do |w|
+      w.line_referential      = line_referential
+      w.stop_area_referential = stop_area_referential
+    end
+
+    workbench = organisation.workbenches.find_or_create_by(name: "Gestion de l'offre") do |w|
+      w.line_referential      = line_referential
+      w.stop_area_referential = stop_area_referential
+      w.objectid_format       = Workbench.objectid_format.stif_netex
+      w.workgroup             = workgroup
 
       Rails.logger.debug "Create Workbench for #{organisation.name}"
     end