From 5afaeeb76dce7eb7362725996025ff44d3be5971 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 26 Sep 2016 21:54:05 +0800 Subject: [PATCH] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E6=80=A7=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/queries_helper.rb | 2 +- app/views/issues/index.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index f058a75ec..5cc72a82d 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -259,7 +259,7 @@ module QueriesHelper params[:op] = {'subject' => "~" , 'status_id' => ( params[:status_id] == '0' ? "!":"=" ), 'author_id' =>(params[:author_id] == '0' ? "!":"=" ), - 'done_ratio' => ( params[:done_ratio]), + 'done_ratio' => ( params[:done_ratio]== '-1' ? "!":"="), '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? diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index b292d07cc..fee3ae1d7 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -175,8 +175,8 @@ <%#= select(:issue, :done_ratio, [["10%",1],["20%",2],["30%",3],["40%",4],["50%",5],["60%",6],["70%",7],["80%",8],["90%",9],["100%",10]].unshift(["完成度",0]), {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0 }, {:onchange => "remote_function();", :id => "done_ratio", :name => "done_ratio", :class => "f1"}) %> - <%= select( :issue,:done_ratio, ((1..10).to_a.collect { |r| ["#{r*10} %", r*10] }).unshift(["完成度",0]), - {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0}, + <%= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }).unshift(["完成度",-1]), + {:include_blank => false, :selected => @done_ratio ? @done_ratio : -1}, {:onchange=>"remote_function();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl"}) %>