From 19483ee762babbf5d31c3fa0ba2457dd523bf9f5 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 18 Nov 2016 09:35:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91issue=E6=97=B6=EF=BC=8C=E9=80=89=E6=8B=A9=E9=87=8C?=
 =?UTF-8?q?=E7=A8=8B=E7=A2=91=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=9A=84=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 9c3c8d168..1b47d80cc 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -853,7 +853,8 @@ class Issue < ActiveRecord::Base
   def assignable_versions
     return @assignable_versions if @assignable_versions
 
-    versions = project.shared_versions.open.all
+   # versions = project.shared_versions.open.all
+    versions = Version.where(:project_id => project.id, :status => "open").order("created_on desc")
     if fixed_version
       if fixed_version_id_changed?
         # nothing to do
@@ -865,7 +866,7 @@ class Issue < ActiveRecord::Base
         versions << fixed_version
       end
     end
-    @assignable_versions = versions.uniq.sort
+    @assignable_versions = versions.uniq
   end
 
   # Returns true if this issue is blocked by another issue that is still open

From b8e59430e8309b38e07f7f872cb7c3bd69a9bead Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 18 Nov 2016 09:46:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=B5=84=E6=BA=90=E6=8F=8F=E8=BF=B0=E6=A1=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=A2=9E=E5=8A=A0=E8=87=B3800px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_project_list.html.erb | 2 +-
 public/stylesheets/css/common.css      | 1 +
 public/stylesheets/project.css         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 1d73fd953..6675842e3 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -41,7 +41,7 @@
                       <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                     </div>
                     <%= form_tag(edit_file_description_project_file_path(file, :project_id => project.id),:remote=>'true', :method => :post, :id=>"files_query_form_#{file.id}") do %>
-                        <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" name="file_description_edit" id="file_description_edit_<%= file.id %>"
+                        <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W800 none " placeholder="请编辑资源描述" name="file_description_edit" id="file_description_edit_<%= file.id %>"
                                   onblur="commit_files_description('#files_query_form_<%= file.id %>','#file_description_edit_<%= file.id %>','#file_description_show_<%= file.id %>','#file_description_tip_<%= file.id %>');"><%= file.description %></textarea>
                     <% end %>
                   </div>
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index afe6192fb..dc6b879b8 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -329,6 +329,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .W600{ width:600px !important;}
 .W700{ width:700px; max-width:700px; min-width:700px;}
 .W710{ width:708px;}
+.W800{ width:800px !important;}
 .maxwidth150{max-width: 150px;}
 .m_w460{max-width: 460px;}
 .m_w500{max-width: 500px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 5903c96e9..3bbea4b3f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1289,3 +1289,4 @@ a.pages-big{ width:50px;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
 .W600{ width:600px;}
+