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

potential fix for #1926

Browse Source
This commit is contained in:
r888888888
2014-02-13 11:30:35 -08:00
parent 0abe4f74d2
commit a285089f7a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/upload.rb
View File

@@ -11,7 +11,7 @@ class Upload < ActiveRecord::Base
before_validation :initialize_status, :on => :create before_validation :initialize_status, :on => :create
before_create :convert_cgi_file before_create :convert_cgi_file
after_destroy :delete_temp_file after_destroy :delete_temp_file
validate :uploader_is_not_limited validate :uploader_is_not_limited, :on => :create
validate :file_or_source_is_present, :on => :create validate :file_or_source_is_present, :on => :create
module ValidationMethods module ValidationMethods

9
test/unit/user_test.rb
View File

@@ -65,11 +65,16 @@ class UserTest < ActiveSupport::TestCase
@user.update_column(:level, User::Levels::CONTRIBUTOR) @user.update_column(:level, User::Levels::CONTRIBUTOR)
assert(@user.can_upload?) assert(@user.can_upload?)
@user.update_column(:level, User::Levels::MEMBER) @user.update_column(:level, User::Levels::MEMBER)
@user.update_column(:created_at, 1.month.ago)
assert_equal(10, @user.upload_limit)
40.times do 9.times do
FactoryGirl.create(:post, :uploader => @user, :is_deleted => true) FactoryGirl.create(:post, :uploader => @user, :is_pending => true)
end end
assert_equal(1, @user.upload_limit)
assert(@user.can_upload?)
FactoryGirl.create(:post, :uploader => @user, :is_pending => true)
assert(!@user.can_upload?) assert(!@user.can_upload?)
end end