From b237f578f4b9124d1f9ee523330039bd295a34fc Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Tue, 13 May 2014 17:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BC=BA=E9=99=B7=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=EF=BC=8C=E9=97=AE=E9=A2=98=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachment_type_edit_controller.rb          | 6 ++++++
 app/models/mailer.rb                                        | 4 ++--
 .../attachment_type_edit/_show_attchment_type.html.erb      | 0
 app/views/files/index.html.erb                              | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 app/controllers/attachment_type_edit_controller.rb
 create mode 100644 app/views/attachment_type_edit/_show_attchment_type.html.erb

diff --git a/app/controllers/attachment_type_edit_controller.rb b/app/controllers/attachment_type_edit_controller.rb
new file mode 100644
index 000000000..91e14f65a
--- /dev/null
+++ b/app/controllers/attachment_type_edit_controller.rb
@@ -0,0 +1,6 @@
+  #资源类型编辑control
+class AttachmentTypeEditController < ApplicationController
+  def index
+
+  end
+end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index d8e3d29bd..e5ede6285 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -63,7 +63,7 @@ class Mailer < ActionMailer::Base
   #   Mailer.issue_add(issue).deliver => sends an email to issue recipients
   def issue_add(issue)
     redmine_headers 'Project' => issue.project.identifier,
-                    'Issue-Id' => issue.id,
+                    'Issue-Id' => (issue.project.issues.index(issue).to_i + 1).to_s,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     message_id issue
@@ -85,7 +85,7 @@ class Mailer < ActionMailer::Base
   def issue_edit(journal)
     issue = journal.journalized.reload
     redmine_headers 'Project' => issue.project.identifier,
-                    'Issue-Id' => issue.id,
+                    'Issue-Id' =>  (issue.project.issues.index(issue).to_i + 1).to_s,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     message_id journal
diff --git a/app/views/attachment_type_edit/_show_attchment_type.html.erb b/app/views/attachment_type_edit/_show_attchment_type.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 7c8129c59..a43b2ae07 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -206,8 +206,8 @@
                     attachments_autocomplete_path(:format => 'js'),
                     :remote => true,
                     :method => :post) do %>
-            <%= label_tag(:attach_search, "按关键字搜索:") %>
-            <%= text_field_tag(:attach_search) %>
+            <%= label_tag(:atext_field_tagttach_search, "按关键字搜索:") %>
+            <%= (:attach_search) %>
             <%#= submit_tag("Search") %>
         <% end -%>
         <%= form_tag attach_relation_path(:format => 'js'),