Make sure that attachments are created in the same order they were selected (#12310).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10793 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-07 18:45:56 +00:00
parent 00927f58af
commit a17f4c8375
2 changed files with 27 additions and 1 deletions
@@ -62,7 +62,19 @@ module Redmine

        def save_attachments(attachments, author=User.current)
          if attachments.is_a?(Hash)
-            attachments = attachments.values
+            attachments = attachments.stringify_keys
+            attachments = attachments.to_a.sort {|a, b|
+              if a.first.to_i > 0 && b.first.to_i > 0
+                a.first.to_i <=> b.first.to_i
+              elsif a.first.to_i > 0
+                1
+              elsif b.first.to_i > 0
+                -1
+              else
+                a.first <=> b.first
+              end
+            }
+            attachments = attachments.map(&:last)
          end
          if attachments.is_a?(Array)
            attachments.each do |attachment|