create organisation

3 files changed, 10 insertions, 1 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 06b340db2..a870ebd7d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -34,6 +34,11 @@ ChouetteIhm::Application.configure do
 
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
+  ActionMailer::Base.smtp_settings = {
+    :address        => "mail.dryade.priv",
+    :domain         => "dryade.priv"
+  }
+
   config.to_prepare do
     chouette_command_script = "tmp/chouette-command/chouette"
     if File.exists? chouette_command_script
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 7d1e93622..bff88d5fc 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -1,6 +1,6 @@
 Apartment.configure do |config|
   # set your options (described below) here
-  config.excluded_models = ["Referential", "User", "Import", "ImportLogMessage", "Export", "ExportLogMessage", "Delayed::Backend::ActiveRecord::Job"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
+  config.excluded_models = ["Referential", "Organisation", "User", "Import", "ImportLogMessage", "Export", "ExportLogMessage", "Delayed::Backend::ActiveRecord::Job"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
 
   # Dynamically get database names to migrate
   config.database_names = lambda{ Referential.pluck(:slug) }
diff --git a/config/routes.rb b/config/routes.rb
index 2d2b7ba81..33f9c99f5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,10 @@
 ChouetteIhm::Application.routes.draw do
   devise_for :users
 
+  resource :organisation do
+    resources :users
+  end
+
   resources :file_validations
 
   resources :referentials do