From bab1cbea5d9a4db661503e45632328a26d8d9654 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 28 Oct 2016 15:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BAissue=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E7=A2=91=E4=B8=8D=E8=83=BD=E9=80=89=E4=B8=AD=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index fc7bdcebe..a80f08cf2 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -40,20 +40,15 @@
           <label class="label"><span class="c_red f12">*</span><%= l(:field_status) %>：</label>
           <%# if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
           <%= f.select :status_id, (@allowed_statuses.collect { |p| [p.name, p.id] }),
-                       {:no_label => true},
-                       # ajax 刷新
-                       #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
-                       :class => "w150" %>
-          <%# else %>
-          <%#= h(@issue.status.name) %>
-          <%# end %>
+                     {:no_label => true},
+                     :class => "w150" %>
         </li>
         <li>
           <label class="label"><span class="c_red f12">*</span><%= l(:field_priority) %>：</label>
           <% if @issue.safe_attribute? 'priority_id' %>
               <%= f.select :priority_id, (@priorities.collect { |p| [p.name, p.id] }),
-                           {:required => true, :no_label => true}, :disabled => !@issue.leaf?,
-                           :class => "w150" %>
+                        {:required => true, :no_label => true}, :disabled => !@issue.leaf?,
+                         :class => "w150" %>
           <% end %>
         </li>
         <li class="clear">
@@ -66,7 +61,7 @@
           <% else %>
             <a href="javascript:void(0);" onclick="issueDetailShow();" class="sy_btn_grey mr5 fr" > 取消 </a>
           <% end %>
-          <a href="javascript:void(0);" class="sy_btn_blue mr5 fr"> 保存并继续</a>
+          <!--<a href="javascript:void(0);" class="sy_btn_blue mr5 fr"> 保存并继续</a>-->
           <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue mr5 fr" id="issue_confirm"> 保存</a>
         </li>
       </ul>
@@ -81,25 +76,17 @@
         <li class=" clear">
           <% if @issue.safe_attribute? 'assigned_to_id' %>
               <%= f.select :assigned_to_id, assigned_options_for_select(@issue.assignable_users, @issue.assigned_to),
-                           {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true},
-                           {:onchange => "change_assigned_tip();",:class => "w150"}  %>
+                        {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true},
+                        {:onchange => "change_assigned_tip();",:class => "w150"}  %>
           <% end %>
         </li>
         <li class=" clear" id="assigned_to_tips">
           <%= @issue.assigned_to.nil? ? "未指派" : "已指派"  %>
         </li>
         <li class=" clear" id="versions_choise_id">
-          <%#= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
-                       {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
-                       {:onchange => "change_milestone_tip();",:class => "w150"} %>
-          <%= render :partial => 'issues/versions_choise' %>
-              <%#= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
-                              new_project_version_path(@issue.project),
-                              :remote => true,
-                              :method => 'get',
-                              :title => l(:label_version_new),
-                              :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
-              <!--<a href="javascript:viod(0)" class="pic_add mt5 ml5"></a>-->
+        <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
+                   {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
+                   {:onchange => "change_milestone_tip();",:class => "w150"} %>
         </li>
         <li class=" clear" id="milestone_option_tips">
           <%= @issue.fixed_version.nil? ? "无里程碑" : "已指派里程碑" %>