From 2ad1c4294da738b94564eb654ef6e3b2a3d186ab Mon Sep 17 00:00:00 2001 From: Georg G Date: Tue, 5 Jan 2016 21:38:36 +0100 Subject: [PATCH] u --- app/models/user.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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