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

Merge pull request #347 from Randuin/master

Browse Source 
Allow the forcing of Upload#process!
This commit is contained in:
r888888888
2012-09-19 00:00:36 -07:00
parent f15edff392 16f887185f
commit c70a5c8fed
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