Refactoring move referentialSupport from chouetteController into childrens

71 files changed, 120 insertions, 103 deletions

diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
index 936b8ea5e..19b3eb742 100644
--- a/app/controllers/access_links_controller.rb
+++ b/app/controllers/access_links_controller.rb
@@ -1,4 +1,5 @@
 class AccessLinksController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::AccessLink
 
   belongs_to :referential do
@@ -83,7 +84,7 @@ class AccessLinksController < ChouetteController
   private
 
   def access_link_params
-    params.require(:access_link).permit(:access_link_type,:access_point_id, :stop_area_id, :objectid, :object_version, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation, :link_orientation_type, :stop_area )
+    params.require(:access_link).permit(:access_link_type,:access_point_id, :stop_area_id, :objectid, :object_version, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation, :link_orientation_type, :stop_area )
   end
 
 end
diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb
index 477875cc9..112a13a86 100644
--- a/app/controllers/access_points_controller.rb
+++ b/app/controllers/access_points_controller.rb
@@ -1,4 +1,5 @@
 class AccessPointsController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::AccessPoint
 
   belongs_to :referential do
@@ -63,7 +64,7 @@ class AccessPointsController < ChouetteController
   private
 
   def access_point_params
-    params.require(:access_point).permit( :objectid, :object_version, :creator_id, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :zip_code, :city_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :stop_area_id, :coordinates )
+    params.require(:access_point).permit( :objectid, :object_version, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :zip_code, :city_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :stop_area_id, :coordinates )
   end
 
 end
diff --git a/app/controllers/api_keys_controller.rb b/app/controllers/api_keys_controller.rb
index eebad5e7b..9706c5961 100644
--- a/app/controllers/api_keys_controller.rb
+++ b/app/controllers/api_keys_controller.rb
@@ -1,4 +1,4 @@
-class ApiKeysController < InheritedResources::Base
+class ApiKeysController < ChouetteController
   defaults resource_class: Api::V1::ApiKey
   include PolicyChecker
 
diff --git a/app/controllers/autocomplete_stop_areas_controller.rb b/app/controllers/autocomplete_stop_areas_controller.rb
index e35a545ae..233012028 100644
--- a/app/controllers/autocomplete_stop_areas_controller.rb
+++ b/app/controllers/autocomplete_stop_areas_controller.rb
@@ -1,4 +1,4 @@
-class AutocompleteStopAreasController < InheritedResources::Base
+class AutocompleteStopAreasController < ChouetteController
   respond_to :json, :only => [:index, :children, :parent, :physicals]
 
   include ReferentialSupport
diff --git a/app/controllers/autocomplete_time_tables_controller.rb b/app/controllers/autocomplete_time_tables_controller.rb
index f65f5b9f6..0a9f51ced 100644
--- a/app/controllers/autocomplete_time_tables_controller.rb
+++ b/app/controllers/autocomplete_time_tables_controller.rb
@@ -1,4 +1,4 @@
-class AutocompleteTimeTablesController < InheritedResources::Base
+class AutocompleteTimeTablesController < ChouetteController
   respond_to :json, :only => [:index]
   before_action :switch_referential
 
diff --git a/app/controllers/autocomplete_timebands_controller.rb b/app/controllers/autocomplete_timebands_controller.rb
index 4922e214c..af041c33e 100644
--- a/app/controllers/autocomplete_timebands_controller.rb
+++ b/app/controllers/autocomplete_timebands_controller.rb
@@ -1,4 +1,4 @@
-class AutocompleteTimebandsController < InheritedResources::Base
+class AutocompleteTimebandsController < ChouetteController
   respond_to :json, :only => [:index]
 
   include ReferentialSupport
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index e9ee7579a..2ed10a111 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,4 +1,4 @@
-class CalendarsController < InheritedResources::Base
+class CalendarsController < ChouetteController
   include PolicyChecker
   defaults resource_class: Calendar
   before_action :ransack_contains_date, only: [:index]
diff --git a/app/controllers/chouette_controller.rb b/app/controllers/chouette_controller.rb
index 1313aa7cc..e6e7c0a8a 100644
--- a/app/controllers/chouette_controller.rb
+++ b/app/controllers/chouette_controller.rb
@@ -1,5 +1,3 @@
 class ChouetteController < InheritedResources::Base
-
   include ApplicationHelper
-  include ReferentialSupport
 end
diff --git a/app/controllers/clean_ups_controller.rb b/app/controllers/clean_ups_controller.rb
index b9ff225b3..ec28aa0fc 100644
--- a/app/controllers/clean_ups_controller.rb
+++ b/app/controllers/clean_ups_controller.rb
@@ -1,4 +1,5 @@
 class CleanUpsController < ChouetteController
+  include ReferentialSupport
   respond_to :html, :only => [:create]
   belongs_to :referential
 
diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index bc5bedd7f..931d846c5 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -1,4 +1,4 @@
-class CompaniesController < InheritedResources::Base
+class CompaniesController < ChouetteController
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::Company
@@ -62,7 +62,7 @@ class CompaniesController < InheritedResources::Base
   helper_method :current_referential
 
   def company_params
-    params.require(:company).permit( :objectid, :object_version, :creator_id, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
+    params.require(:company).permit( :objectid, :object_version, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
   end
 
   private
diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index 175c22191..eda17a1c6 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceCheckSetsController < InheritedResources::Base
+class ComplianceCheckSetsController < ChouetteController
   defaults resource_class: ComplianceCheckSet
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("created_at", DateTime) }
@@ -20,10 +20,10 @@ class ComplianceCheckSetsController < InheritedResources::Base
   end
 
   def executed
-    show! do |format| 
+    show! do |format|
       # But now nobody is aware anymore that `format.html` passes a parameter into the block
       format.html { executed_for_html }
-    end 
+    end
   end
 
 
diff --git a/app/controllers/compliance_control_blocks_controller.rb b/app/controllers/compliance_control_blocks_controller.rb
index f53a1e04a..9eee8dfaf 100644
--- a/app/controllers/compliance_control_blocks_controller.rb
+++ b/app/controllers/compliance_control_blocks_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceControlBlocksController < InheritedResources::Base
+class ComplianceControlBlocksController < ChouetteController
   include PolicyChecker
   defaults resource_class: ComplianceControlBlock
   belongs_to :compliance_control_set
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 83a345c6f..2d3d03ad0 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceControlSetsController < InheritedResources::Base
+class ComplianceControlSetsController < ChouetteController
   include PolicyChecker
   defaults resource_class: ComplianceControlSet
   include RansackDateFilter
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index 5a9c0b671..dfbecaa71 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceControlsController < InheritedResources::Base
+class ComplianceControlsController < ChouetteController
   include PolicyChecker
   defaults resource_class: ComplianceControl
   belongs_to :compliance_control_set
diff --git a/app/controllers/connection_link_areas_controller.rb b/app/controllers/connection_link_areas_controller.rb
index eceb1b0fc..981a7639e 100644
--- a/app/controllers/connection_link_areas_controller.rb
+++ b/app/controllers/connection_link_areas_controller.rb
@@ -1,16 +1,17 @@
 class ConnectionLinkAreasController < ChouetteController
+  include ReferentialSupport
 
   respond_to :json, :only => :index
 
   def index
-    respond_to do |format|  
-      format.json { render :json => areas_maps }  
-    end  
+    respond_to do |format|
+      format.json { render :json => areas_maps }
+    end
   end
 
   def areas_maps
     areas.collect do |area|
-      { :id => area.id.to_s, 
+      { :id => area.id.to_s,
         :name => area.name,
         :country_code =>  area.country_code,
         :zip_code => area.zip_code || "",
@@ -20,8 +21,8 @@ class ConnectionLinkAreasController < ChouetteController
     end
   end
 
-  def areas 
-    referential.connection_links.find(params[:connection_link_id]).possible_areas.select{ |p| p.name =~ /#{params[:q]}/i  }       
+  def areas
+    referential.connection_links.find(params[:connection_link_id]).possible_areas.select{ |p| p.name =~ /#{params[:q]}/i  }
   end
 
 end
diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb
index b56450291..f14868776 100644
--- a/app/controllers/connection_links_controller.rb
+++ b/app/controllers/connection_links_controller.rb
@@ -1,4 +1,5 @@
 class ConnectionLinksController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::ConnectionLink
 
   belongs_to :referential do
@@ -53,7 +54,7 @@ class ConnectionLinksController < ChouetteController
   private
 
   def connection_link_params
-    params.require(:connection_link).permit( :connection_link_type,:departure_id, :arrival_id, :objectid, :object_version, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs )
+    params.require(:connection_link).permit( :connection_link_type,:departure_id, :arrival_id, :objectid, :object_version, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs )
   end
 
 end
diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
index 1c7876c58..de5085f3e 100644
--- a/app/controllers/dashboards_controller.rb
+++ b/app/controllers/dashboards_controller.rb
@@ -3,7 +3,7 @@
 # this controller will use a custom partial like
 # custom/dashboards/_dashboard.html.slim for Custom::Dashboard
 #
-class DashboardsController < InheritedResources::Base
+class DashboardsController < ChouetteController
   respond_to :html, only: [:show]
 
   def show
diff --git a/app/controllers/export_tasks_controller.rb b/app/controllers/export_tasks_controller.rb
index 2b30a5605..b889c1882 100644
--- a/app/controllers/export_tasks_controller.rb
+++ b/app/controllers/export_tasks_controller.rb
@@ -1,6 +1,7 @@
 class ExportTasksController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => ExportTask
-  
+
   respond_to :html, :only => [:new, :create]
   respond_to :js, :only => [:new, :create]
   belongs_to :referential
@@ -15,10 +16,10 @@ class ExportTasksController < ChouetteController
       redirect_to referential_path(@referential)
     end
   end
-  
+
   def create
     @available_exports = available_exports
-    begin            
+    begin
       create! do |success, failure|
         success.html { redirect_to referential_exports_path(@referential) }
       end
@@ -62,7 +63,7 @@ class ExportTasksController < ChouetteController
     end
   end
 
-  def build_resource    
+  def build_resource
     @export_task ||= if params[:export_task].present?
                        export_task_parameters = params[:export_task]
                        case export_task_parameters[:data_format]
@@ -80,7 +81,7 @@ class ExportTasksController < ChouetteController
                      else
                        NeptuneExport.new
                      end
-    
+
   end
-  
+
 end
diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index ad88c6dae..ccc163e34 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -2,6 +2,7 @@ require 'will_paginate/array'
 require 'open-uri'
 
 class ExportsController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Export
 
   respond_to :html, :only => [:show, :index, :destroy, :exported_file]
diff --git a/app/controllers/group_of_lines_controller.rb b/app/controllers/group_of_lines_controller.rb
index 1a59d39f7..5762108dc 100644
--- a/app/controllers/group_of_lines_controller.rb
+++ b/app/controllers/group_of_lines_controller.rb
@@ -1,4 +1,4 @@
-class GroupOfLinesController < InheritedResources::Base
+class GroupOfLinesController < ChouetteController
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::GroupOfLine
@@ -73,7 +73,7 @@ class GroupOfLinesController < InheritedResources::Base
   private
 
   def group_of_line_params
-    params.require(:group_of_line).permit( :objectid, :object_version, :creator_id, :name, :comment, :lines, :registration_number, :line_tokens)
+    params.require(:group_of_line).permit( :objectid, :object_version, :name, :comment, :lines, :registration_number, :line_tokens)
   end
 
 end
diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index c3c6b46b5..6546b25f8 100644
--- a/app/controllers/import_messages_controller.rb
+++ b/app/controllers/import_messages_controller.rb
@@ -1,4 +1,4 @@
-class ImportMessagesController < InheritedResources::Base
+class ImportMessagesController < ChouetteController
   defaults resource_class: ImportMessage, collection_name: 'import_messages', instance_name: 'import_message'
   respond_to :csv
   belongs_to :import, :parent_class => Import do
diff --git a/app/controllers/import_resources_controller.rb b/app/controllers/import_resources_controller.rb
index 3e52233f2..c83721310 100644
--- a/app/controllers/import_resources_controller.rb
+++ b/app/controllers/import_resources_controller.rb
@@ -1,4 +1,4 @@
-class ImportResourcesController < InheritedResources::Base
+class ImportResourcesController < ChouetteController
   defaults resource_class: ImportResource, collection_name: 'import_resources', instance_name: 'import_resource'
   respond_to :html
   belongs_to :import
diff --git a/app/controllers/import_tasks_controller.rb b/app/controllers/import_tasks_controller.rb
index cb377ec5a..1a349087d 100644
--- a/app/controllers/import_tasks_controller.rb
+++ b/app/controllers/import_tasks_controller.rb
@@ -1,6 +1,7 @@
 class ImportTasksController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => ImportTask
-  
+
   respond_to :html, :only => [:new, :create]
   respond_to :js, :only => [:new, :create]
   belongs_to :referential
@@ -15,10 +16,10 @@ class ImportTasksController < ChouetteController
       redirect_to referential_path(@referential)
     end
   end
-  
+
   def create
     @available_imports = available_imports
-    begin            
+    begin
       create! do |success, failure|
         success.html { redirect_to referential_imports_path(@referential) }
       end
@@ -33,14 +34,14 @@ class ImportTasksController < ChouetteController
 
   def available_imports
     import_task_parameters = params[:import_task]
-    
+
     if import_task_parameters.present?
       @available_imports = [
         import_task_parameters[:data_format] == "neptune" ? build_resource : NeptuneImport.new(:referential_id => @referential.id ),
         import_task_parameters[:data_format] == "netex" ? build_resource : NetexImport.new(:referential_id => @referential.id ),
         import_task_parameters[:data_format] == "gtfs" ? build_resource : GtfsImport.new(:referential_id => @referential.id )
       ]
-    else      
+    else
       @available_imports = [
         NeptuneImport.new(:referential_id => @referential.id ),
         NetexImport.new(:referential_id => @referential.id ),
@@ -48,7 +49,7 @@ class ImportTasksController < ChouetteController
       ]
     end
   end
-  
+
   def build_resource
     @import_task ||= if params[:import_task].present?
                        import_task_parameters = params[:import_task]
@@ -64,5 +65,5 @@ class ImportTasksController < ChouetteController
                        @import_task = NeptuneImport.new
                      end
   end
-  
+
 end
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 6c9d81d82..5e23a1795 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -1,4 +1,4 @@
-class ImportsController < InheritedResources::Base
+class ImportsController < ChouetteController
   include PolicyChecker
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("started_at", DateTime) }
diff --git a/app/controllers/journey_pattern_stop_points_controller.rb b/app/controllers/journey_pattern_stop_points_controller.rb
index c4fc9b08f..65e41af3b 100644
--- a/app/controllers/journey_pattern_stop_points_controller.rb
+++ b/app/controllers/journey_pattern_stop_points_controller.rb
@@ -1,4 +1,5 @@
 class JourneyPatternStopPointsController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::JourneyPattern
 
   respond_to :html
diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb
index 546158fa8..736fb1441 100644
--- a/app/controllers/journey_patterns_collections_controller.rb
+++ b/app/controllers/journey_patterns_collections_controller.rb
@@ -1,4 +1,5 @@
 class JourneyPatternsCollectionsController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::JourneyPattern
   before_action :user_permissions, only: :show
 
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index a72e7da7f..881ab6630 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -1,4 +1,5 @@
 class JourneyPatternsController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::JourneyPattern
 
   respond_to :html
@@ -54,7 +55,7 @@ class JourneyPatternsController < ChouetteController
   private
 
   def journey_pattern_params
-    params.require(:journey_pattern).permit(:route_id, :objectid, :object_version, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, {:stop_point_ids => []})
+    params.require(:journey_pattern).permit(:route_id, :objectid, :object_version, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, {:stop_point_ids => []})
   end
 
 end
diff --git a/app/controllers/line_footnotes_controller.rb b/app/controllers/line_footnotes_controller.rb
index 2d4d10064..1fe677a39 100644
--- a/app/controllers/line_footnotes_controller.rb
+++ b/app/controllers/line_footnotes_controller.rb
@@ -1,4 +1,5 @@
 class LineFootnotesController < ChouetteController
+  include ReferentialSupport
   defaults resource_class: Chouette::Line, collection_name: 'lines', instance_name: 'line'
   belongs_to :referential
 
diff --git a/app/controllers/line_referentials_controller.rb b/app/controllers/line_referentials_controller.rb
index f70ddef41..39c2cdb89 100644
--- a/app/controllers/line_referentials_controller.rb
+++ b/app/controllers/line_referentials_controller.rb
@@ -1,4 +1,4 @@
-class LineReferentialsController < InheritedResources::Base
+class LineReferentialsController < ChouetteController
 
   defaults :resource_class => LineReferential
 
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index cf2908500..2f0ef1542 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -1,4 +1,4 @@
-class LinesController < InheritedResources::Base
+class LinesController < ChouetteController
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::Line
@@ -119,7 +119,6 @@ class LinesController < InheritedResources::Base
       :company_id,
       :objectid,
       :object_version,
-      :creator_id,
       :name,
       :number,
       :published_name,
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 98c840777..81f9ab6ce 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -1,4 +1,4 @@
-class NetworksController < InheritedResources::Base
+class NetworksController < ChouetteController
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::Network
@@ -70,7 +70,7 @@ class NetworksController < InheritedResources::Base
   helper_method :current_referential
 
   def network_params
-    params.require(:network).permit(:objectid, :object_version, :creator_id, :version_date, :description, :name, :registration_number, :source_name, :source_type_name, :source_identifier, :comment )
+    params.require(:network).permit(:objectid, :object_version, :version_date, :description, :name, :registration_number, :source_name, :source_type_name, :source_identifier, :comment )
   end
 
   private
diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index d80541800..fa521faaf 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -1,4 +1,4 @@
-class OrganisationsController < InheritedResources::Base
+class OrganisationsController < ChouetteController
 
   defaults :resource_class => Organisation
   respond_to :html, :only => [:edit, :show, :update]
diff --git a/app/controllers/referential_companies_controller.rb b/app/controllers/referential_companies_controller.rb
index fdbd83dc9..ca1ff67db 100644
--- a/app/controllers/referential_companies_controller.rb
+++ b/app/controllers/referential_companies_controller.rb
@@ -1,4 +1,5 @@
 class ReferentialCompaniesController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::Company, :collection_name => 'companies', :instance_name => 'company'
   respond_to :html
   respond_to :xml
@@ -55,7 +56,7 @@ class ReferentialCompaniesController < ChouetteController
   end
 
   def company_params
-    params.require(:company).permit( :objectid, :object_version, :creator_id, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
+    params.require(:company).permit( :objectid, :object_version, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
   end
 
   private
diff --git a/app/controllers/referential_group_of_lines_controller.rb b/app/controllers/referential_group_of_lines_controller.rb
index d88daab84..1294fc5d5 100644
--- a/app/controllers/referential_group_of_lines_controller.rb
+++ b/app/controllers/referential_group_of_lines_controller.rb
@@ -1,4 +1,5 @@
 class ReferentialGroupOfLinesController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::GroupOfLine, :collection_name => 'group_of_lines', :instance_name => 'group_of_line'
 
   respond_to :html
@@ -68,7 +69,7 @@ class ReferentialGroupOfLinesController < ChouetteController
   private
 
   def group_of_line_params
-    params.require(:group_of_line).permit( :objectid, :object_version, :creator_id, :name, :comment, :lines, :registration_number, :line_tokens)
+    params.require(:group_of_line).permit( :objectid, :object_version, :name, :comment, :lines, :registration_number, :line_tokens)
   end
 
 end
diff --git a/app/controllers/referential_lines_controller.rb b/app/controllers/referential_lines_controller.rb
index b9f8c0050..9e8f5c512 100644
--- a/app/controllers/referential_lines_controller.rb
+++ b/app/controllers/referential_lines_controller.rb
@@ -1,4 +1,5 @@
 class ReferentialLinesController < ChouetteController
+  include ReferentialSupport
   include PolicyChecker
 
   defaults :resource_class => Chouette::Line, :collection_name => 'lines', :instance_name => 'line'
@@ -127,7 +128,6 @@ class ReferentialLinesController < ChouetteController
       :company_id,
       :objectid,
       :object_version,
-      :creator_id,
       :name, :number,
       :published_name,
       :transport_mode,
diff --git a/app/controllers/referential_networks_controller.rb b/app/controllers/referential_networks_controller.rb
index 2131b8e57..b2d83f953 100644
--- a/app/controllers/referential_networks_controller.rb
+++ b/app/controllers/referential_networks_controller.rb
@@ -1,4 +1,5 @@
 class ReferentialNetworksController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::Network, :collection_name => 'networks', :instance_name => 'network'
   respond_to :html
   respond_to :xml
@@ -64,7 +65,7 @@ class ReferentialNetworksController < ChouetteController
   end
 
   def network_params
-    params.require(:network).permit(:objectid, :object_version, :creator_id, :version_date, :description, :name, :registration_number, :source_name, :source_type_name, :source_identifier, :comment )
+    params.require(:network).permit(:objectid, :object_version, :version_date, :description, :name, :registration_number, :source_name, :source_type_name, :source_identifier, :comment )
   end
 
   private
diff --git a/app/controllers/referential_stop_areas_controller.rb b/app/controllers/referential_stop_areas_controller.rb
index 78dcd6dd9..0ed330180 100644
--- a/app/controllers/referential_stop_areas_controller.rb
+++ b/app/controllers/referential_stop_areas_controller.rb
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 class ReferentialStopAreasController  < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::StopArea, :collection_name => 'stop_areas', :instance_name => 'stop_area'
 
   belongs_to :referential do
@@ -144,7 +145,7 @@ class ReferentialStopAreasController  < ChouetteController
   end
 
   def stop_area_params
-    params.require(:stop_area).permit( :routing_stop_ids, :routing_line_ids, :children_ids, :stop_area_type, :parent_id, :objectid, :object_version, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :zip_code, :city_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :coordinates, :url, :time_zone )
+    params.require(:stop_area).permit( :routing_stop_ids, :routing_line_ids, :children_ids, :stop_area_type, :parent_id, :objectid, :object_version, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :zip_code, :city_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :coordinates, :url, :time_zone )
   end
 
 end
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index b63741ef6..ee1236912 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -1,4 +1,4 @@
-class ReferentialsController < InheritedResources::Base
+class ReferentialsController < ChouetteController
   defaults :resource_class => Referential
   include PolicyChecker
 
diff --git a/app/controllers/route_stop_points_controller.rb b/app/controllers/route_stop_points_controller.rb
index 730bd08a9..36e1cbc4f 100644
--- a/app/controllers/route_stop_points_controller.rb
+++ b/app/controllers/route_stop_points_controller.rb
@@ -1,4 +1,5 @@
 class RouteStopPointsController < ChouetteController
+  include ReferentialSupport
   defaults resource_class: Chouette::StopPoint
   actions :index
   respond_to :json, only: :index
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb
index 1a6c82484..79f49143a 100644
--- a/app/controllers/routes_controller.rb
+++ b/app/controllers/routes_controller.rb
@@ -1,4 +1,5 @@
 class RoutesController < ChouetteController
+  include ReferentialSupport
   include PolicyChecker
   defaults :resource_class => Chouette::Route
 
@@ -110,7 +111,6 @@ class RoutesController < ChouetteController
       :line_id,
       :objectid,
       :object_version,
-      :creator_id,
       :name,
       :comment,
       :opposite_route_id,
diff --git a/app/controllers/routing_constraint_zones_controller.rb b/app/controllers/routing_constraint_zones_controller.rb
index 6c3da5980..a72b288b8 100644
--- a/app/controllers/routing_constraint_zones_controller.rb
+++ b/app/controllers/routing_constraint_zones_controller.rb
@@ -1,4 +1,5 @@
 class RoutingConstraintZonesController < ChouetteController
+  include ReferentialSupport
   include PolicyChecker
 
   defaults resource_class: Chouette::RoutingConstraintZone
@@ -96,7 +97,6 @@ class RoutingConstraintZonesController < ChouetteController
       :route_id,
       :objectid,
       :object_version,
-      :creator_id
     )
   end
 
diff --git a/app/controllers/stop_area_copies_controller.rb b/app/controllers/stop_area_copies_controller.rb
index fb429595e..992a2bb08 100644
--- a/app/controllers/stop_area_copies_controller.rb
+++ b/app/controllers/stop_area_copies_controller.rb
@@ -1,13 +1,14 @@
 class StopAreaCopiesController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => StopAreaCopy
   belongs_to :referential do
-    belongs_to :stop_area, :parent_class => Chouette::StopArea 
+    belongs_to :stop_area, :parent_class => Chouette::StopArea
   end
-  
+
   actions :new, :create
   respond_to :html, :only => :new
-  
-  def new    
+
+  def new
     @stop_area_copy = StopAreaCopy.new(:hierarchy => params[:hierarchy], :source => parent)
     new! do
       build_breadcrumb :new
@@ -25,6 +26,6 @@ class StopAreaCopiesController < ChouetteController
     end
   end
 
-  protected 
+  protected
 
 end
diff --git a/app/controllers/stop_area_referentials_controller.rb b/app/controllers/stop_area_referentials_controller.rb
index e2815e5fb..85541230d 100644
--- a/app/controllers/stop_area_referentials_controller.rb
+++ b/app/controllers/stop_area_referentials_controller.rb
@@ -1,4 +1,4 @@
-class StopAreaReferentialsController < InheritedResources::Base
+class StopAreaReferentialsController < ChouetteController
 
   defaults :resource_class => StopAreaReferential
   def sync
diff --git a/app/controllers/stop_area_routing_lines_controller.rb b/app/controllers/stop_area_routing_lines_controller.rb
index 9ba6fb40c..cba0a369c 100644
--- a/app/controllers/stop_area_routing_lines_controller.rb
+++ b/app/controllers/stop_area_routing_lines_controller.rb
@@ -1,11 +1,12 @@
 class StopAreaRoutingLinesController < ChouetteController
+  include ReferentialSupport
 
   respond_to :json, :only => :index
 
   def index
-    respond_to do |format|  
-      format.json { render :json => routing_lines_maps }  
-    end  
+    respond_to do |format|
+      format.json { render :json => routing_lines_maps }
+    end
   end
 
   def routing_lines_maps
@@ -14,8 +15,8 @@ class StopAreaRoutingLinesController < ChouetteController
     end
   end
 
-  def routing_lines 
-    referential.lines.all.select{ |p| p.name =~ /#{params[:q]}/i || p.number =~ /#{params[:q]}/i }       
+  def routing_lines
+    referential.lines.all.select{ |p| p.name =~ /#{params[:q]}/i || p.number =~ /#{params[:q]}/i }
   end
 
 end
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 1d6f88068..63e2cd97a 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -1,4 +1,4 @@
-class StopAreasController < InheritedResources::Base
+class StopAreasController < ChouetteController
   include ApplicationHelper
 
   defaults :resource_class => Chouette::StopArea
@@ -171,7 +171,7 @@ class StopAreasController < InheritedResources::Base
   helper_method :current_referential
 
   def stop_area_params
-    params.require(:stop_area).permit( :routing_stop_ids, :routing_line_ids, :children_ids, :stop_area_type, :parent_id, :objectid, :object_version, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :zip_code, :city_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :coordinates, :url, :time_zone )
+    params.require(:stop_area).permit( :routing_stop_ids, :routing_line_ids, :children_ids, :stop_area_type, :parent_id, :objectid, :object_version, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :zip_code, :city_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :coordinates, :url, :time_zone )
   end
 
 end
diff --git a/app/controllers/time_table_combinations_controller.rb b/app/controllers/time_table_combinations_controller.rb
index ba61a2ea4..26cd425b3 100644
--- a/app/controllers/time_table_combinations_controller.rb
+++ b/app/controllers/time_table_combinations_controller.rb
@@ -1,4 +1,5 @@
 class TimeTableCombinationsController < ChouetteController
+  include ReferentialSupport
   belongs_to :referential do
     belongs_to :time_table, :parent_class => Chouette::TimeTable
   end
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 0c1769ad7..a0fa168f0 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -1,4 +1,5 @@
 class TimeTablesController < ChouetteController
+  include ReferentialSupport
   include TimeTablesHelper
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("bounding_dates", Date) }
@@ -179,7 +180,6 @@ class TimeTablesController < ChouetteController
     params.require(:time_table).permit(
       :objectid,
       :object_version,
-      :creator_id,
       :calendar_id,
       :version, :comment, :color,
       :int_day_types,
diff --git a/app/controllers/timebands_controller.rb b/app/controllers/timebands_controller.rb
index 765557193..937283b0e 100644
--- a/app/controllers/timebands_controller.rb
+++ b/app/controllers/timebands_controller.rb
@@ -1,4 +1,5 @@
 class TimebandsController < ChouetteController
+  include ReferentialSupport
 
   defaults :resource_class => Chouette::Timeband
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2452a2796..6343320a4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-class UsersController < InheritedResources::Base
+class UsersController < ChouetteController
 
   defaults :resource_class => User
 
diff --git a/app/controllers/vehicle_journey_exports_controller.rb b/app/controllers/vehicle_journey_exports_controller.rb
index 0cc30f23a..2ce47e51f 100644
--- a/app/controllers/vehicle_journey_exports_controller.rb
+++ b/app/controllers/vehicle_journey_exports_controller.rb
@@ -1,22 +1,23 @@
 class VehicleJourneyExportsController < ChouetteController
+  include ReferentialSupport
   belongs_to :referential do
     belongs_to :line, :parent_class => Chouette::Line do
       belongs_to :route, :parent_class => Chouette::Route
     end
   end
-  
+
   respond_to :csv, :only => [:index]
   respond_to :zip, :only => [:index]
   #respond_to :xls, :only => [:index]
 
   def index
-    index! do |format|      
+    index! do |format|
       format.csv { send_data VehicleJourneyExport.new(:route => route, :vehicle_journeys => vehicle_journeys).to_csv(:col_sep => ";") , :filename => t("vehicle_journey_exports.new.basename")+"_#{route.id}.csv" }
       format.zip do
         begin
           temp_file = Tempfile.new("vehicle_journey_export")
           VehicleJourneyExport.new(:route => route, :vehicle_journeys => vehicle_journeys).to_zip(temp_file,:col_sep => ";")
-          send_data  File.read(temp_file.path), :filename => t("vehicle_journey_exports.new.basename")+"_#{route.id}.zip" 
+          send_data  File.read(temp_file.path), :filename => t("vehicle_journey_exports.new.basename")+"_#{route.id}.zip"
         ensure
           temp_file.close
           temp_file.unlink
@@ -25,15 +26,15 @@ class VehicleJourneyExportsController < ChouetteController
       #format.xls
     end
   end
-  
+
   protected
-  
-    
+
+
   alias_method :route, :parent
- 
+
   def collection
     @vehicle_journeys ||= route.vehicle_journeys.includes(:vehicle_journey_at_stops).order("vehicle_journey_at_stops.departure_time")
   end
   alias_method :vehicle_journeys, :collection
-  
+
 end
diff --git a/app/controllers/vehicle_journey_imports_controller.rb b/app/controllers/vehicle_journey_imports_controller.rb
index 58f8816aa..aec90f7ec 100644
--- a/app/controllers/vehicle_journey_imports_controller.rb
+++ b/app/controllers/vehicle_journey_imports_controller.rb
@@ -1,4 +1,5 @@
 class VehicleJourneyImportsController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => VehicleJourneyImport
 
   belongs_to :referential do
diff --git a/app/controllers/vehicle_journeys_collections_controller.rb b/app/controllers/vehicle_journeys_collections_controller.rb
index caaa2258e..712bcc154 100644
--- a/app/controllers/vehicle_journeys_collections_controller.rb
+++ b/app/controllers/vehicle_journeys_collections_controller.rb
@@ -1,4 +1,5 @@
 class VehicleJourneysCollectionsController < ChouetteController
+  include ReferentialSupport
   respond_to :json
   belongs_to :referential do
     belongs_to :line, :parent_class => Chouette::Line do
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 050f2f219..c941aeae4 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -1,4 +1,5 @@
 class VehicleJourneysController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::VehicleJourney
   before_action :user_permissions, only: :index
 
diff --git a/app/controllers/vehicle_translations_controller.rb b/app/controllers/vehicle_translations_controller.rb
index 65a0db7fe..5b6b392ac 100644
--- a/app/controllers/vehicle_translations_controller.rb
+++ b/app/controllers/vehicle_translations_controller.rb
@@ -1,4 +1,5 @@
 class VehicleTranslationsController < ChouetteController
+  include ReferentialSupport
   respond_to :js, :only => [:new, :create]
 
   belongs_to :referential do
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb
index 9b4f0d6c4..b2dac9e67 100644
--- a/app/controllers/workbenches_controller.rb
+++ b/app/controllers/workbenches_controller.rb
@@ -1,4 +1,4 @@
-class WorkbenchesController < InheritedResources::Base
+class WorkbenchesController < ChouetteController
   before_action :query_params, only: [:show]
   include RansackDateFilter
   before_action only: [:show] { set_date_time_params("validity_period", Date) }
diff --git a/app/models/concerns/default_attributes_support.rb b/app/models/concerns/default_attributes_support.rb
index e85a59160..2ef9149cb 100644
--- a/app/models/concerns/default_attributes_support.rb
+++ b/app/models/concerns/default_attributes_support.rb
@@ -47,7 +47,6 @@ module DefaultAttributesSupport
     else
       self.object_version += 1
     end
-    self.creator_id = 'chouette'
   end
 
   def reset_auto_columns
diff --git a/app/views/api/kml/access_links/index.kml.slim b/app/views/api/kml/access_links/index.kml.slim
index 1bcfdacf1..06db8bf9d 100644
--- a/app/views/api/kml/access_links/index.kml.slim
+++ b/app/views/api/kml/access_links/index.kml.slim
@@ -8,7 +8,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
       placemark id="#{access_link.objectid}"
         name = h(access_link.name)
         extendeddata
-          - [ :access_link_type, :objectid, :object_version, :created_at, :updated_at, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation].each do |prop|
+          - [ :access_link_type, :objectid, :object_version, :created_at, :updated_at, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation].each do |prop|
             data name="#{prop.to_s}"
               value = h(access_link.send( prop))
 
diff --git a/app/views/api/kml/access_points/index.kml.slim b/app/views/api/kml/access_points/index.kml.slim
index 1a162f7ed..c6f6b7797 100644
--- a/app/views/api/kml/access_points/index.kml.slim
+++ b/app/views/api/kml/access_points/index.kml.slim
@@ -9,7 +9,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
       placemark id="#{access_point.objectid}"
         name = h(access_point.name)
         extendeddata
-          - [ :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability].each do |prop|
+          - [ :objectid, :object_version, :created_at, :updated_at, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability].each do |prop|
             data name="#{prop.to_s}"
               value = h(access_point.send( prop))
 
diff --git a/app/views/api/kml/connection_links/index.kml.slim b/app/views/api/kml/connection_links/index.kml.slim
index 7305fbc78..0acdeaafe 100644
--- a/app/views/api/kml/connection_links/index.kml.slim
+++ b/app/views/api/kml/connection_links/index.kml.slim
@@ -8,7 +8,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
       placemark id="#{connection_link.objectid}"
         name = h(connection_link.name)
         extendeddata
-          - [ :connection_link_type, :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|
+          - [ :connection_link_type, :objectid, :object_version, :created_at, :updated_at, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|
             data name="#{prop.to_s}"
               value = h(connection_link.send( prop))
 
diff --git a/app/views/api/kml/journey_patterns/show.kml.slim b/app/views/api/kml/journey_patterns/show.kml.slim
index 15fb96daa..347d358cc 100644
--- a/app/views/api/kml/journey_patterns/show.kml.slim
+++ b/app/views/api/kml/journey_patterns/show.kml.slim
@@ -4,7 +4,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
   document
     name = "#{h(Chouette::JourneyPattern.model_name.human)} : #{h(@journey_pattern.name)}"
     extendeddata
-      - [:objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :registration_number, :published_name].each do |prop|
+      - [:objectid, :object_version, :created_at, :updated_at, :name, :comment, :registration_number, :published_name].each do |prop|
         data name="#{prop.to_s}"
           value = h(@journey_pattern.send( prop))
 
@@ -17,7 +17,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
         placemark id="#{stop_area.objectid}"
           name = h(stop_area.name)
           extendeddata
-            - [ :objectid, :object_version, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|
+            - [ :objectid, :object_version, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|
               data name="#{prop.to_s}"
                 value = h(stop_area.send( prop))
 
diff --git a/app/views/api/kml/lines/show.kml.slim b/app/views/api/kml/lines/show.kml.slim
index d1e48323d..1163c98d3 100644
--- a/app/views/api/kml/lines/show.kml.slim
+++ b/app/views/api/kml/lines/show.kml.slim
@@ -7,7 +7,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
     placemark id="#{@line.objectid}"
       name = h(@line.name)
       extendeddata
-        - [ :transport_mode, :objectid, :created_at, :updated_at, :object_version, :creator_id, :name, :number, :published_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs].each do |prop|
+        - [ :transport_mode, :objectid, :created_at, :updated_at, :object_version, :name, :number, :published_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs].each do |prop|
           data name="#{prop.to_s}"
             value = h(@line.send( prop))
 
diff --git a/app/views/api/kml/routes/show.kml.slim b/app/views/api/kml/routes/show.kml.slim
index 8a2843bc0..fdf73754d 100644
--- a/app/views/api/kml/routes/show.kml.slim
+++ b/app/views/api/kml/routes/show.kml.slim
@@ -6,7 +6,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
     placemark id="#{@route.objectid}"
       name = h(@route.name)
       extendeddata
-        - [:direction, :wayback, :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :published_name, :number, :direction_text, :wayback_text].each do |prop|
+        - [:direction, :wayback, :objectid, :object_version, :created_at, :updated_at, :name, :comment, :published_name, :number, :direction_text, :wayback_text].each do |prop|
           data name="#{prop.to_s}"
             value = h(@route.send( prop))
 
diff --git a/app/views/api/kml/stop_areas/index.kml.slim b/app/views/api/kml/stop_areas/index.kml.slim
index a08dbf963..284bd3e34 100644
--- a/app/views/api/kml/stop_areas/index.kml.slim
+++ b/app/views/api/kml/stop_areas/index.kml.slim
@@ -8,7 +8,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"
       placemark id="#{stop_area.objectid}"
         name =  h(stop_area.name)
         extendeddata
-          - [:objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|
+          - [:objectid, :object_version, :created_at, :updated_at, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|
             data name="#{prop.to_s}"
               value = h(stop_area.send( prop))
 
diff --git a/app/views/api/v1/compliance_check_sets/validated.rabl b/app/views/api/v1/compliance_check_sets/validated.rabl
index 1368a8014..4dfa9e420 100644
--- a/app/views/api/v1/compliance_check_sets/validated.rabl
+++ b/app/views/api/v1/compliance_check_sets/validated.rabl
@@ -4,7 +4,6 @@ attributes(
   :id,
   :referential_id,
   :name,
-  :creator,
   :status,
   :started_at,
   :ended_at
diff --git a/app/views/api/v1/group_of_lines/short_description.rabl b/app/views/api/v1/group_of_lines/short_description.rabl
index 770b334ec..15465874c 100644
--- a/app/views/api/v1/group_of_lines/short_description.rabl
+++ b/app/views/api/v1/group_of_lines/short_description.rabl
@@ -1,6 +1,6 @@
 object @group_of_line
 extends "api/v1/trident_objects/short_description"
 
-[ :creator_id, :name].each do |attr|
+[:name].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
diff --git a/app/views/api/v1/group_of_lines/show.rabl b/app/views/api/v1/group_of_lines/show.rabl
index 96e4bfc58..d02247da9 100644
--- a/app/views/api/v1/group_of_lines/show.rabl
+++ b/app/views/api/v1/group_of_lines/show.rabl
@@ -1,6 +1,6 @@
 object @group_of_line
 extends "api/v1/trident_objects/show"
 
-[ :creator_id, :name].each do |attr|
+[:name].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
diff --git a/app/views/api/v1/trident_objects/show.rabl b/app/views/api/v1/trident_objects/show.rabl
index e58c0a866..9722594e1 100644
--- a/app/views/api/v1/trident_objects/show.rabl
+++ b/app/views/api/v1/trident_objects/show.rabl
@@ -1,5 +1,5 @@
 attributes :objectid => :object_id
-[ :object_version, :created_at, :updated_at, :creator_id].each do |attr|
+[ :object_version, :created_at, :updated_at].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
 
diff --git a/db/migrate/20171121153506_remove_creator_id.rb b/db/migrate/20171121153506_remove_creator_id.rb
index 84be06027..520941841 100644
--- a/db/migrate/20171121153506_remove_creator_id.rb
+++ b/db/migrate/20171121153506_remove_creator_id.rb
@@ -5,7 +5,7 @@ class RemoveCreatorId < ActiveRecord::Migration
       'journey_patterns', 'lines', 'networks', 'pt_links', 'routes', 'routing_constraint_zones',
       'stop_areas', 'stop_points', 'time_tables', 'timebands', 'vehicle_journeys', 'access_links', 'access_points'
     ].each do |table_name|
-      remove_column table_name, :creator_id
+      remove_column table_name, :creator_id, :string
     end
   end
 end
diff --git a/db/migrate/20171121163631_remove_creator_from_compliance_check_sets.rb b/db/migrate/20171121163631_remove_creator_from_compliance_check_sets.rb
index 0e8179ea5..0798b2040 100644
--- a/db/migrate/20171121163631_remove_creator_from_compliance_check_sets.rb
+++ b/db/migrate/20171121163631_remove_creator_from_compliance_check_sets.rb
@@ -1,5 +1,5 @@
 class RemoveCreatorFromComplianceCheckSets < ActiveRecord::Migration
   def change
-    remove_column :compliance_check_sets, :creator
+    remove_column :compliance_check_sets, :creator, :string
   end
 end
diff --git a/db/migrate/20171121163832_remove_creator_from_imports.rb b/db/migrate/20171121163832_remove_creator_from_imports.rb
deleted file mode 100644
index d672c491e..000000000
--- a/db/migrate/20171121163832_remove_creator_from_imports.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveCreatorFromImports < ActiveRecord::Migration
-  def change
-    remove_column :imports, :creator
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 0577025ba..3f2638a76 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171121163832) do
+ActiveRecord::Schema.define(version: 20171121163631) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -404,6 +404,7 @@ ActiveRecord::Schema.define(version: 20171121163832) do
     t.datetime "notified_parent_at"
     t.integer  "current_step",                    default: 0
     t.integer  "total_steps",                     default: 0
+    t.string   "creator"
   end
 
   add_index "imports", ["referential_id"], name: "index_imports_on_referential_id", using: :btree