Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/models/issue.rb

@@ -240,11 +240,14 @@ class Issue < ActiveRecord::Base
     self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
     self.status = issue.status
     self.author = User.current
-    unless options[:attachments] == false
-      self.attachments = issue.attachments.map do |attachement| 
-        attachement.copy(:container => self)
-      end
-    end
+    #赞不提供附件复制功能
+    #unless options[:attachments] == false
+      #self.attachments = issue.attachments.map do |attachement|
+      #  a = attachement.copy(:container => self)
+      #  #a.save
+      #  a
+      #end
+    #end
     @copied_from = issue
     @copy_options = options
     self

app/views/attachments/_form.html.erb

@@ -4,7 +4,11 @@
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
-                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      if attachment.id.nil?
+       else
+        link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+      end
+      %>
       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
       <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>

app/views/issues/new.html.erb

@@ -11,8 +11,9 @@
 
     <% if @copy_from && @copy_from.attachments.any? %>
     <p>
-      <label for="copy_attachments"><%= l(:label_copy_attachments) %></label>
-      <%= check_box_tag 'copy_attachments', '1', @copy_attachments %>
+      <!-- 去除附件复制功能 -->
+      <!-- <label for="copy_attachments"><#%= l(:label_copy_attachments) %></label>
+      <#%= check_box_tag 'copy_attachments', '1', @copy_attachments %>  -->
     </p>
     <% end %>
     <% if @copy_from && !@copy_from.leaf? %>