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

fix

Browse Source
This commit is contained in:
albert
2013-02-17 22:33:33 -05:00
parent 693627d3c9
commit 1b780e27ab
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/upload.rb
View File

@@ -25,7 +25,7 @@ class Upload < ActiveRecord::Base
md5_post = Post.find_by_md5(md5) md5_post = Post.find_by_md5(md5)
if md5_post if md5_post
merge_tags(md5_post) merge_tags(md5_post)
raise "duplicate: #{post.id}" raise "duplicate: #{md5_post.id}"
end end
end end

1
app/views/uploads/new.html.erb
View File

@@ -9,6 +9,7 @@
<%= render "image" %> <%= render "image" %>
<%= render "post", :post => @post %> <%= render "post", :post => @post %>
<%= render "sources/info", :source => @source %> <%= render "sources/info", :source => @source %>
<%= form_for(@upload, :html => {:multipart => true, :class => "simple_form", :id => 'form'}) do |f| %> <%= form_for(@upload, :html => {:multipart => true, :class => "simple_form", :id => 'form'}) do |f| %>
<div class="input"> <div class="input">
<%= f.label :file %> <%= f.label :file %>