From 617565bf1f2c99f10ec5e0c1dd9255156e2856b0 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sun, 25 Sep 2016 16:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/queries_helper.rb   |  6 +++---
 app/views/issues/index.html.erb | 32 ++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 4a8306920..7677528aa 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -255,17 +255,17 @@ module QueriesHelper
       # Give it a name, required to be valid
       @query = IssueQuery.new(:name => "_")
       @query.project = @project
-      params[:f] = %w(subject tracker_id status_id priority_id done_ratio assigned_to_id fixed_version_id created_on) unless params[:status_id].nil?
+      params[:f] = %w(subject tracker_id status_id done_ratio assigned_to_id fixed_version_id created_on) unless params[:status_id].nil?
       params[:op] = {'subject' => "~" ,
                      'status_id' => ( params[:status_id] == '0' ? "!":"=" ),
-                     'priority_id' => ( params[:priority_id] == '0' ? "!":"=" ),
+
                      'done_ratio' => ( params[:done_ratio] == '0' ? "!":"=" ),
                     'tracker_id' => ( params[:tracker_id] == '0' ? "!":"=" ),
                     'fixed_version_id' => ( params[:fixed_version_id] == '0' ? "!":"=" ),
                     'assigned_to_id' => ( params[:assigned_to_id] == '0' ? "!":"=" )} unless params[:status_id].nil?
       params[:v] = {'subject' => [params[:subject]],
                     'status_id' => [params[:status_id]],
-                    'priority_id' => [params[:priority_id]],
+
                     'done_ratio' => [params[:done_ratio]],
                     'tracker_id' => [params[:tracker_id]],
                     'fixed_version_id' => [params[:fixed_version_id]],
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 7d7c5f460..046595128 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -135,13 +135,27 @@
               <div class="issues_filter ">
                 <div class="issues_form_filter mt5 mr5">
 
+                  <%= select(:issue, :tracker, [["缺陷",1],["功能",2],["支持",3],["任务",4],["周报",5]].unshift(["类型",0]),
+                             {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0},
+                             {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %>
+
                   <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
                               { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
                               },
                               {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl"}
                       )
                   %>
-                  <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
+                  <%= select(:issue, :fixed_version, options_for_version_isuue_list(@project),
+                             {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0},
+                             {:onchange => "remote_function();", :id => "fixed_version_id", :name => "fixed_version_id", :class => "f1"}) %>
+
+                  <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
+                              { :include_blank => false,:selected=>@status_id ? @status_id : 0
+                              },
+                              {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl issues_filter_select_min"}
+                      )
+                  %>
+                  <%#= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
                               { :include_blank => false,:selected=>@priority_id ?  @priority_id : 0
                               },
                               {:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"fl"}
@@ -155,20 +169,10 @@
                               {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0},
                               {:onchange=>"remote_function();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl"}) %>
 
-                  <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
-                              { :include_blank => false,:selected=>@status_id ? @status_id : 0
-                              },
-                              {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl"}
-                      )
-                  %>
 
-                  <%= select(:issue, :tracker, [["缺陷",1],["功能",2],["支持",3],["任务",4],["周报",5]].unshift(["类型",0]),
-                             {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0},
-                             {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl"}) %>
-
-                  <%= select(:issue, :fixed_version, options_for_version_isuue_list(@project),
-                             {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0},
-                             {:onchange => "remote_function();", :id => "fixed_version_id", :name => "fixed_version_id", :class => "f1"}) %>
+                  <%= select(:issue, :test, [["最新创建",1],["最早创建",2],["最近更新",3],["最早更新", 4]].unshift(["排序",0]),
+                             {:include_blank => false, :selected => @order ? @order : 0 },
+                             {:onchange => "remote_function();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %>
 
                   <%#= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
                               { :include_blank => false,:selected=>@author_id ? @author_id : 0