jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:r888888888/danbooru

Browse Source
This commit is contained in:
albert
2012-09-19 16:53:49 -04:00
parent 858a8ed72a c70a5c8fed
commit 3a11b0e6ed
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/upload.rb
View File

@@ -48,8 +48,8 @@ class Upload < ActiveRecord::Base
end end
module ConversionMethods module ConversionMethods
def process! def process! force=false
return if status =~ /processing|completed|error/ return if !force && status =~ /processing|completed|error/
CurrentUser.scoped(uploader, uploader_ip_addr) do CurrentUser.scoped(uploader, uploader_ip_addr) do
update_attribute(:status, "processing") update_attribute(:status, "processing")
@@ -304,4 +304,4 @@ class Upload < ActiveRecord::Base
def presenter def presenter
@presenter ||= UploadPresenter.new(self) @presenter ||= UploadPresenter.new(self)
end end
end end