From 61bf6604b1ffc8355cca02ef05a25d8b2d6a03e6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 13 Jul 2016 12:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3ajax=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8Cissue=E7=8A=B6=E6=80=81=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb  | 1 +
 app/views/issues/_attributes.html.erb | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 44f0d15f4..73877ddc7 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -440,6 +440,7 @@ class IssuesController < ApplicationController
       jour.save
       update_user_activity(@issue.class,@issue.id)
       update_forge_activity(@issue.class,@issue.id)
+      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
 
       @user_activity_id = params[:user_activity_id]
       if params[:issue_id]
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index f0967843a..cb9b79c7c 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -4,15 +4,15 @@
         <ul class="fl">
           <li>
             <label class="label"><span class="c_red f12">*</span><%= l(:field_status) %>：</label>
-            <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
+            <%# 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 %>
+            <%# else %>
+                <%#= h(@issue.status.name) %>
+            <%# end %>
           </li>
           <div class="cl"></div>
           <li>