From ef931d14918e059a0c5bc9c736c97bbc5657ed2a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 13 Jul 2016 12:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91issue=EF=BC=8C=E4=B8=8E?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8Dissue=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb     | 24 ------------------------
 app/views/issues/add_journal.js.erb |  5 +++--
 app/views/issues/show.html.erb      |  6 +++++-
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 8b313a2ef..e2b6a0a17 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -58,13 +58,6 @@
       </ul>
     </div>
     <li>
-      <%# 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 %>  -->
-          <!--</p>-->
-      <%# end %>
       <% if @copy_from && !@copy_from.leaf? %>
           <p>
             <label for="copy_subtasks"><%= l(:label_copy_subtasks) %></label>
@@ -83,23 +76,6 @@
       <%= render :partial => 'issues/attributes' %>
     </div>
     <div class="cl"></div>
-    <!--<div class="newpro_box02 ">-->
-    <!--<label class="label"> <%#= l(:label_issue_watchers) %>：</label>-->
-    <!--<input id="" name="" size="22" class="fl mb10 h26" type="text" placeholder="搜索添加跟踪者">-->
-    <!--<span class="search_for_watchers">-->
-    <%#= link_to "",
-#                       {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
-#                       :remote => true,
-#                       :method => 'get',
-                      :class => "pic_sch mt5 ml5" %>
-    <!--</span>-->
-    <%#= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture')  }')" %>
-    <!--<div class="cl"></div>-->
-    <!--<span id="watchers_inputs">-->
-    <!--<%#= watchers_checkboxes(@issue, @available_watchers) %>-->
-    <!--</span>-->
-    <!--<div class="cl"></div>-->
-    <!--</div>-->
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
 <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>
diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb
index 21519d5a1..838e2d83d 100644
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@@ -1,8 +1,9 @@
 <% if @issue_id %> //issue详情中回复
     $("#reply_div_<%= @issue_id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>");
     $("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => Issue.find( @issue_id)}) %>");
-    $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
-    sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%=@issue.class.name%>");
+    $("#issue_detail_show").html('<%= escape_javascript(render :partial => 'issues/detail') %>')
+    $("#issue_edit_show").html('<%= escape_javascript(render :partial => 'issues/edit') %>')
+    sd_create_editor_from_data(<%= @issue.id %>, null, "100%", "<%= @issue.class.name %>");
     issue_desc_editor = KindEditor.create('#issue_description',
         {"width":"85%",
             "resizeType":0,
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 67bb4d59d..13642c0ca 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -15,7 +15,7 @@
         }
     });
 </script>
-<div  class="homepageRight mt0 ml10" >
+<div  class="homepageRight mt0 ml10" id =issue_show_total"">
     <div class="homepageRightBanner">
       <div class="NewsBannerName">问题跟踪</div>
     </div>
@@ -23,8 +23,12 @@
   <div class="resources mt10" >
     <div class="pro_page_box">
       <div  class="problem_main borderBottomNone">
+        <div id="issue_detail_show">
           <%= render :partial => 'issues/detail'%>
+        </div>
+        <div id="issue_edit_show">
           <%= render :partial => 'issues/edit'%>
+        </div>
       </div>
 
       <!--problem_main end-->