diff --git a/app/models/user.rb b/app/models/user.rb index feddc538..88ccb520 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -253,6 +253,10 @@ class User < ActiveRecord::Base end def can_export? - !self.export_processing? && (!self.export_created_at.nil? && Time.now > self.export_created_at.in(1.week)) + if self.export_processing? + false + else + !self.export_created_at.nil? && Time.now > self.export_created_at.in(1.week) + end end end