aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2014-05-19 16:10:56 +0200
committerMarc Florisson2014-05-19 18:09:09 +0200
commitb3cce39ad16735cc08a23cf084aec5f4e54eba0a (patch)
treea1a5e5cdeed0fc49543bbc8e32a8dc04f9a61cf7
parent344b2775749317babe46ed4a4ea8c18a3be2621a (diff)
downloadchouette-core-b3cce39ad16735cc08a23cf084aec5f4e54eba0a.tar.bz2
fix rake task for demo restore
-rw-r--r--app/models/api/v1/api_key.rb3
-rw-r--r--lib/tasks/demo.rake2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/api/v1/api_key.rb b/app/models/api/v1/api_key.rb
index 2c1b9ba5f..7390db232 100644
--- a/app/models/api/v1/api_key.rb
+++ b/app/models/api/v1/api_key.rb
@@ -9,6 +9,7 @@ module Api
end
def eql?(other)
+ return false unless other.respond_to?( :token)
other.token == self.token
end
@@ -21,7 +22,7 @@ module Api
private
def generate_access_token
begin
- self.token = "#{referential.id}-#{SecureRandom.hex}"
+ self.token = "#{referential.id}-#{SecureRandom.hex}"
end while self.class.exists?(:token => self.token)
end
end
diff --git a/lib/tasks/demo.rake b/lib/tasks/demo.rake
index 8e9a53ac0..d78637c96 100644
--- a/lib/tasks/demo.rake
+++ b/lib/tasks/demo.rake
@@ -14,7 +14,7 @@ namespace :demo do
referential = organisation.referentials.create( :name => "Tatrobus", :slug => "tatrobus", :prefix => "TAT")
resource = Rack::Test::UploadedFile.new( Rails.application.config.demo_data, 'application/zip', false)
- import_instance = referential.import_tasks.create( :resources => resource, :referential_id => referential.id)
+ import_instance = referential.import_tasks.create( :resources => resource, :referential_id => referential.id, :user_name => user.name, :no_save => false, :user_id => user.id)
import_instance.import
puts "Restore demo environment complete"
end