From 770c9f229b1f30e47ab820d6bceb91e12fed7fa8 Mon Sep 17 00:00:00 2001 From: kawasima Date: Tue, 4 Sep 2012 23:23:34 +0900 Subject: [PATCH] Attachments must be hash in redmine 1.x --- app/helpers/impasse_screenshots_helper.rb | 6 ++++-- assets/javascripts/test_case_tree.js | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/helpers/impasse_screenshots_helper.rb b/app/helpers/impasse_screenshots_helper.rb index 29cbf11..d534dd5 100644 --- a/app/helpers/impasse_screenshots_helper.rb +++ b/app/helpers/impasse_screenshots_helper.rb @@ -16,7 +16,9 @@ def create_thumbnail(attachments) end def thumbnail_file(attachment) - thumbnail_file = File.join(File.dirname(attachment.diskfile), "impasse_thumbnail", - File.basename(attachment.diskfile, ".*") + "_s" + File.extname(attachment.diskfile)) + thumbnail_dir = File.join(File.dirname(attachment.diskfile), "impasse_thumbnail") + Dir.mkdir thumbnail_dir unless File.exist? thumbnail_dir + thumbnail_file = File.join(thumbnail_dir, + File.basename(attachment.diskfile, ".*") + "_s" + File.extname(attachment.diskfile)) end end diff --git a/assets/javascripts/test_case_tree.js b/assets/javascripts/test_case_tree.js index bcd1290..224d37c 100644 --- a/assets/javascripts/test_case_tree.js +++ b/assets/javascripts/test_case_tree.js @@ -209,11 +209,11 @@ jQuery(document).ready(function ($) { tc["node[id]"] = node.attr("id").replace("node_",""); tc["node_type"] = node_type; tc["node[parent_id]"] = $(data.rslt.parent).attr("id").replace("node_", ""); - tc["node[node_order"] = data.rslt.obj.parent().children().index(data.rslt.obj); + tc["node[node_order]"] = data.rslt.obj.parent().children().index(data.rslt.obj); if (window.FormData) { var formData = new FormData(); - $(".new-screenshot", dialog[node_type]).each(function() { - formData.append("attachments[][file]", dataURLtoBlob(this.src) ,'screenshot.png'); + $(".new-screenshot", dialog[node_type]).each(function(i) { + formData.append("attachments["+i+"][file]", dataURLtoBlob(this.src) ,'screenshot.png'); }); for (var key in tc) { formData.append(key, tc[key]) }