aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorXinhui2017-08-16 16:35:17 +0200
committerXinhui2017-08-16 17:10:04 +0200
commitaea07f1fec58444bbc0b7c876d6dacddbe43bbcf (patch)
treefe081ad92da89f5baf801e9b28e745ccbfe74dd5 /app
parentcbb90d47fd539025180efb9d79262a9d4f2674be (diff)
downloadchouette-core-aea07f1fec58444bbc0b7c876d6dacddbe43bbcf.tar.bz2
Import validate presence of creator
Refs #4270
Diffstat (limited to 'app')
-rw-r--r--app/controllers/api/v1/netex_imports_controller.rb4
-rw-r--r--app/controllers/imports_controller.rb1
-rw-r--r--app/models/import.rb2
3 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb
index 17eec2ef8..8f7c8e67e 100644
--- a/app/controllers/api/v1/netex_imports_controller.rb
+++ b/app/controllers/api/v1/netex_imports_controller.rb
@@ -26,9 +26,9 @@ module Api
end
def create_netex_import
- @netex_import = NetexImport.new(netex_import_params.merge(referential_id: @new_referential.id))
+ @netex_import = NetexImport.new(netex_import_params.merge(referential_id: @new_referential.id, creator: 'Webservice'))
@netex_import.save!
- rescue ActiveRecord::RecordInvalid
+ rescue ActiveRecord::RecordInvalid
render json: {errors: @netex_import.errors}, status: 406
finish_action!
end
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 9ddbbb012..916e5ac23 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -59,6 +59,7 @@ class ImportsController < BreadcrumbController
# Manage only NetexImports for the moment
@import ||= NetexImport.new(*resource_params) do |import|
import.workbench = parent
+ import.creator = current_user.name
end
end
diff --git a/app/models/import.rb b/app/models/import.rb
index 17899cc82..e97649d00 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -9,7 +9,7 @@ class Import < ActiveRecord::Base
enumerize :status, in: %i(new pending successful failed running aborted canceled)
validates :file, presence: true
- validates_presence_of :referential, :workbench
+ validates_presence_of :referential, :workbench, :creator
before_create :initialize_fields