4 files changed, 58 insertions, 6 deletions
diff --git a/app/models/chouette/area_type.rb b/app/models/chouette/area_type.rb
new file mode 100644
index 000000000..f295fe7ae
--- /dev/null
+++ b/app/models/chouette/area_type.rb
@@ -0,0 +1,37 @@
+class Chouette::AreaType
+
+  ALL = %i(zdep zder zdlp zdlr lda).freeze
+
+  @@all = ALL
+  mattr_accessor :all
+
+  def self.all=(values)
+    @@all = ALL & values
+    reset_caches!
+  end
+
+  @@instances = {}
+  def self.find(code)
+    code = code.to_sym
+    @@instances[code] ||= new(code) if ALL.include? code
+  end
+
+  def self.reset_caches!
+    @@instances = {}
+    @@options = nil
+  end
+
+  def self.options
+    @@options ||= all.map { |c| find(c) }.map { |t| [ t.label, t.code ] }
+  end
+
+  attr_reader :code
+  def initialize(code)
+    @code = code
+  end
+
+  def label
+    I18n.translate code, scope: 'area_types.label'
+  end
+
+end
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index cc7170728..f216ce449 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -9,7 +9,7 @@ module Chouette
     include ObjectidSupport
 
     extend Enumerize
-    enumerize :area_type, in: %i(zdep zder zdlp zdlr lda)
+    enumerize :area_type, in: Chouette::AreaType::ALL
 
     with_options dependent: :destroy do |assoc|
       assoc.has_many :stop_points
@@ -196,10 +196,12 @@ module Chouette
       GeoRuby::SimpleFeatures::Envelope.from_coordinates coordinates
     end
 
+    # DEPRECATED use StopArea#area_type
     def stop_area_type
       area_type ? area_type : " "
     end
 
+    # DEPRECATED use StopArea#area_type
     def stop_area_type=(stop_area_type)
       self.area_type = (stop_area_type ? stop_area_type.camelcase : nil)
     end
diff --git a/app/models/referential_cloning.rb b/app/models/referential_cloning.rb
index 5bf283814..24117e6c8 100644
--- a/app/models/referential_cloning.rb
+++ b/app/models/referential_cloning.rb
@@ -2,14 +2,27 @@ class ReferentialCloning < ActiveRecord::Base
   include AASM
   belongs_to :source_referential, class_name: 'Referential'
   belongs_to :target_referential, class_name: 'Referential'
-  after_commit :perform_clone, :on => :create
+  after_commit :clone, on: :create
 
-  private
-  def perform_clone
+  def clone
     ReferentialCloningWorker.perform_async(id)
-    # ReferentialCloningWorker.new.perform(id)
   end
 
+  def clone!
+    run!
+
+    AF83::SchemaCloner
+      .new(source_referential.slug, target_referential.slug)
+      .clone_schema
+
+    successful!
+  rescue Exception => e
+    Rails.logger.error "Clone failed : #{e}"
+    failed!
+  end
+
+  private
+
   aasm column: :status do
     state :new, :initial => true
     state :pending
diff --git a/app/models/user.rb b/app/models/user.rb
index 37d35209a..1342f60ed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -36,7 +36,7 @@ class User < ActiveRecord::Base
     self.name         = extra[:full_name]
     self.email        = extra[:email]
     self.organisation = Organisation.sync_update extra[:organisation_code], extra[:organisation_name], extra[:functional_scope]
-    self.permissions  = Stif::PermissionTranslator.translate(extra[:permissions])
+    self.permissions  = Stif::PermissionTranslator.translate(extra[:permissions], self.organisation)
   end
 
   def self.portail_api_request