Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

app/controllers/issues_controller.rb

@@ -94,6 +94,7 @@ class IssuesController < ApplicationController
         @tracker_id = params[:tracker_id]
         @assign_to_id = params[:assigned_to_id]
         @author_id = params[:author_id]
+        @priority_id = params[:priority_id]
         @status_id = params[:status_id]
         @subject = params[:subject]
         @done_ratio = params[:done_ratio]

app/helpers/queries_helper.rb

@@ -255,10 +255,11 @@ 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 done_ratio author_id assigned_to_id fixed_version_id created_on) unless params[:status_id].nil?
+      params[:f] = %w(subject tracker_id status_id priority_id done_ratio author_id assigned_to_id fixed_version_id created_on) unless params[:status_id].nil?
       params[:op] = {'subject' => "~" ,
                      'status_id' => ( params[:status_id] == '0' ? "!":"=" ),
                      'author_id' =>(params[:author_id] == '0' ? "!":"=" ),
+                     'priority_id' => (params[:priority_id] == '0' ? "!" : "="),
                      'done_ratio' => ( params[:done_ratio]== '-1' ? "!":"="),
                     'tracker_id' => ( params[:tracker_id] == '0' ? "!":"=" ),
                     'fixed_version_id' => ( params[:fixed_version_id] == '0' ? "!":"=" ),
@@ -266,6 +267,7 @@ module QueriesHelper
       params[:v] = {'subject' => [params[:subject]],
                     'status_id' => [params[:status_id]],
                     'author_id' => [params[:author_id]],
+                    'priority_id' => [params[:priority_id]],
                     'done_ratio' => [params[:done_ratio]],
                     'tracker_id' => [params[:tracker_id]],
                     'fixed_version_id' => [params[:fixed_version_id]],

app/views/issues/_all_list.html.erb

@@ -7,9 +7,11 @@
     <%= render :partial => 'issues/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
 <% end %>
 <div style="text-align:center;">
-  <div class="pages" style="width:auto; display:inline-block;">
+  <a href="<%=project_issues_path(:project_id => @project, :format => 'xls', :export => true, :set_filter => "1")%>" id="sendexcel" class="btn_newpro_grey fl ml15 mt15" alt="导出" onclick="remote_function_export('<%= @project.id %>')">导出</a>
+  <a href="#" class="btn_newpro_grey fl ml5 mt15" alt="统计">统计</a>
+  <div class="pages fr" style="width:auto; display:inline-block;">
     <ul  id="issue_list_pagination">
-      <%= pagination_links_full @issue_pages, @issue_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+      <%= pagination_links_full @issue_pages, @issue_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
     </ul>
     <div class="cl"></div>
   </div>

app/views/issues/_issue_filter.html.erb

@@ -1 +1 @@
-<span class="issues_nav_tag ml5" ><%= @issues_filter_assign_count %></span>
+<span class="issues_nav_tag ml5" ><%= @issues_filter_assign_count %><%= @project.issues.where(:assigned_to_id => User.current.id ).visible.all.count  %></span>

app/views/issues/_issue_filter_author.html.erb

@@ -1 +1 @@
-<span class="issues_nav_tag ml5"><%= @issues_filter_author_count %><%#= @project.issues.where(:author_id => User.current.id ).visible.all.count  %></span>
+<span class="issues_nav_tag ml5"><%= @issues_filter_author_count %><%= @project.issues.where(:author_id => User.current.id ).visible.all.count  %></span>

app/views/issues/_project_issue.html.erb

@@ -1,4 +1,4 @@
-<% unless activity.author.nil? %>
+    <% unless activity.author.nil? %>
     <div class="issues_list_box clear"  id="user_activity_<%= user_activity_id%>">
       <div class="issues_ciricons fl ">
         <% if activity.status_id.to_i == 5 %>
@@ -13,16 +13,33 @@
           <div class="cl"></div>
         </div>
         <div class="issues_list_small">
-          <% if activity.try(:author).try(:realname) == ' ' %>
-              <%= link_to activity.try(:author), user_path(activity.author_id), :class => "fl issues_list_name" %>
-          <% else %>
-              <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "fl issues_list_name" %>
-          <% end %>
-          <p class="fl ml10"> <span class="mr5"><%=format_time(activity.created_on) %></span>发布</p>
+          <%# if activity.try(:author).try(:realname) == ' ' %>
+              <%#= link_to activity.try(:author), user_path(activity.author_id), :class => "fl issues_list_name" %>
+          <%# else %>
+              <%#= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "fl issues_list_name" %>
+          <%# end %>
+          <!--p class="fl ml10"> <span class="mr5"><%#=format_time(activity.created_on) %></span>发布</p-->
+          <p class="fl issues_list_name" ><span class="mr5"><%= format_time(activity.created_on) %> </span>发布</p>
+          <p class="fl ml10"> <span class="mr5"><%= format_time(activity.updated_on) %> </span>更新</p>
         </div>
       </div>
       <ul class="issues_list_txt fr">
-        <li class="issues_list_min c_grey">
+        <li class="c_grey fl">
+          <% if activity.try(:author).try(:realname) == ' ' %>
+          <%= link_to activity.try(:author), user_path(activity.author_id), :class=>"fl"%>
+          <% else %>
+          <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class=>"fl"%>
+          <% end %>
+        </li>
+        <li class="c_grey fl">
+          <% unless activity.assigned_to_id.nil? %>
+              <% if activity.try(:assigned_to).try(:realname).empty? %>
+                  <%= link_to activity.assigned_to, user_path(activity.assigned_to_id), :class=>"fl"%>
+              <% else %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class=>"fl"%>
+              <% end %>
+          <% end %></li>
+        <li class="issues_list_min c_grey mr5">
           <% case activity.tracker_id %>
           <% when 1%>
               缺陷
@@ -36,6 +53,9 @@
               周报
           <% end %>
         </li>
+        <li class="c_grey issues_list_min mr10">
+          <%= activity.priority.name %>
+        </li>
         <!--li class="c_grey">
           <#% if activity.try(:author).try(:realname) == ' ' %>
               <%#= link_to activity.try(:author), user_path(activity.author_id), :class => "c_grey" %>
@@ -43,18 +63,11 @@
               <%#= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "c_grey" %>
           <%# end %>
         </li-->
-        <li class="c_grey">
-        <% unless activity.assigned_to_id.nil? %>
-            <% if activity.try(:assigned_to).try(:realname).empty? %>
-                <%= link_to activity.assigned_to, user_path(activity.assigned_to_id), :class => "c_grey" %>
-            <% else %>
-                <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %>
-            <% end %>
-        <% end %></li>
-        <li class="c_grey" style="width: 60px; padding-right: 10px" title="<%= activity.fixed_version %>"><%= activity.fixed_version %></li>
-        <li class="issues_list_min c_grey" ><%= activity.status.name%></li>
-        <li class="<%=(activity.done_ratio == 100 ? 'c_red' : 'c_green') %>"><%= activity.done_ratio %>%</li>
-        <li class="issues_list_min pr">
+
+        <li class="c_grey issues_list_max" style="width: 60px; padding-right: 10px" title="<%= activity.fixed_version %>"><%= activity.fixed_version %></li>
+        <li class="issues_list_min c_grey mr10" ><%= activity.status.name%></li>
+        <li class="<%=(activity.done_ratio == 100 ? 'c_red issues_list_min mr5' : 'c_green issues_list_min mr5') %>"><%= activity.done_ratio %>%</li>
+        <li class="issues_list_min">
         <% if activity.journals.count > 0%>
           <span class="issues_icons_mes fl mr5" style="margin-top:-3px;"></span>
           <span class="fl mr5"><%= activity.journals.count %></span>

app/views/issues/index.html.erb

@@ -3,19 +3,69 @@
 <% end %>
 
 <script xmlns="http://www.w3.org/1999/html">
+  function add_style(){
+    if($("select[id='tracker_id']").val() != 0){
+        $("#tracker_id").addClass('issues_filter_active');
+    }
+    if($("select[id='author_id']").val() != 0){
+        $("#author_id").addClass('issues_filter_active');
+    }
+    if($("select[id='assigned_to_id']").val() !=0){
+        $("#assigned_to_id").addClass('issues_filter_active');
+    }
+    if($("select[id='priority_id']").val() !=0){
+        $("#priority_id").addClass('issues_filter_active');
+    }
+    if($("select[id='fixed_version_id']").val() !=0){
+        $("#fixed_version_id").addClass('issues_filter_active');
+    }
+    if($("select[id='status_id']").val() != 0 ){
+        $("#status_id").addClass('issues_filter_active');
+    }
+    if($("select[id='done_ratio']").val() != -1){
+        $("#done_ratio").addClass('issues_filter_active');
+    }
+    if($("select[id='test']").val() != 0 ){
+        $("#test").addClass('issues_filter_active');
+    }
+    if($("select[id='tracker_id']").val() == 0){
+        $("#tracker_id").removeClass('issues_filter_active');
+    }
+    if($("select[id='author_id']").val() == 0){
+        $("#author_id").removeClass('issues_filter_active');
+    }
+    if($("select[id='assigned_to_id']").val() ==0){
+        $("#assigned_to_id").removeClass('issues_filter_active');
+    }
+    if($("select[id='priority_id']").val() ==0){
+        $("#priority_id").removeClass('issues_filter_active');
+    }
+    if($("select[id='fixed_version_id']").val() ==0){
+        $("#fixed_version_id").removeClass('issues_filter_active');
+    }
+    if($("select[id='status_id']").val() == 0 ){
+        $("#status_id").removeClass('issues_filter_active');
+    }
+    if($("select[id='done_ratio']").val() == -1){
+        $("#done_ratio").removeClass('issues_filter_active');
+    }
+    if($("select[id='test']").val() == 0 ){
+        $("#test").removeClass('issues_filter_active');
+    }
+  };
     //issues列表
-    /*function g(o){
+    function g(o){
         return document.getElementById(o);
     }
     function HoverLi(n){
 //如果有N个标签,就将i<=N;
         for(var i=1;i<=3;i++){
             g('issues_list_nav_'+i).className='issues_nav_nomal';
-
+            g('issues_list_content_'+i).className='undis';
         }
-
+        g('issues_list_content_'+n).className='dis';
         g('issues_list_nav_'+n).className='issues_nav_hover';
-    }*/
+    }
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
@@ -65,12 +115,11 @@
         var done_ratio = $("#done_ratio").attr("value");
         var test = $("#test").attr("value");
         var author_id = $("#author_id").attr("value");
+        var priority_id = $("#priority_id").attr("value");
         var issue_create_date_start = $("#issue_date_start_issue_export").attr("value");
         var issue_create_date_end = $("#issue_date_end_issue_export").attr("value");
-        $("#sendexcel").attr("href","/projects/"+project_id+"/issues.xls?export=true&set_filter=1&tracker_id="+tracker_id+"&assigned_to_id="+assigned_to_id+"&fixed_version_id="+fixed_version_id+"&status_id="+status_id+"&done_ratio="+done_ratio+"&test="+test+"&author_id="+author_id+"&subject="+subject+"&issue_create_date_start="+issue_create_date_start+"&issue_create_date_end="+issue_create_date_end);
+        $("#sendexcel").attr("href","/projects/"+project_id+"/issues.xls?export=true&set_filter=1&tracker_id="+tracker_id+"&assigned_to_id="+assigned_to_id+"&fixed_version_id="+fixed_version_id+"&status_id="+status_id+"&done_ratio="+done_ratio+"&test="+test+"&author_id="+author_id+"&subject="+subject+"&issue_create_date_start="+issue_create_date_start+"&issue_create_date_end="+issue_create_date_end+"&priority_id="+priority_id);
         ///projects/1811/issues.xls?export=true&set_filter=1
-
-
     }
 
  //   function nh_reset_form() {
@@ -94,6 +143,20 @@
         });
         $("select[id='assigned_to_id']").find(assign).attr("selected", "selected");
         $("select[id='author_id']").val('');
+        $("select[id='priority_id']").val('');
+        $("select[id='tracker_id']").val('');
+        $("select[id='fixed_version_id']").val('');
+        $("select[id='status_id']").val('');
+        $("select[id='done_ratio']").val('');
+        $("select[id='test']").val('');
+        $("#tracker_id").removeClass('issues_filter_active');
+        $("#author_id").removeClass('issues_filter_active');
+        $("#assigned_to_id").addClass('issues_filter_active');
+        $("#priority_id").removeClass('issues_filter_active');
+        $("#fixed_version_id").removeClass('issues_filter_active');
+        $("#status_id").removeClass('issues_filter_active');
+        $("#done_ratio").removeClass('issues_filter_active');
+        $("#test").removeClass('issues_filter_active');
         remote_function();
     }
 
@@ -104,6 +167,21 @@
 
         });
         $("select[id='author_id']").find(user).attr("selected", "selected");
+        $("select[id='assigned_to_id']").val('');
+        $("select[id='priority_id']").val('');
+        $("select[id='tracker_id']").val('');
+        $("select[id='fixed_version_id']").val('');
+        $("select[id='status_id']").val('');
+        $("select[id='done_ratio']").val('');
+        $("select[id='test']").val('');
+        $("#tracker_id").removeClass('issues_filter_active');
+        $("#author_id").addClass('issues_filter_active');
+        $("#assigned_to_id").removeClass('issues_filter_active');
+        $("#priority_id").removeClass('issues_filter_active');
+        $("#fixed_version_id").removeClass('issues_filter_active');
+        $("#status_id").removeClass('issues_filter_active');
+        $("#done_ratio").removeClass('issues_filter_active');
+        $("#test").removeClass('issues_filter_active');
         remote_function();
     }
     // 清楚表单所有选项
@@ -112,6 +190,14 @@
         $("select[id='author_id']").val('');
         $("select[id='assigned_to_id']").val('');
         $("input[nhname='date_val']").val('');
+        $("#tracker_id").removeClass('issues_filter_active');
+        $("#author_id").removeClass('issues_filter_active');
+        $("#assigned_to_id").removeClass('issues_filter_active');
+        $("#priority_id").removeClass('issues_filter_active');
+        $("#fixed_version_id").removeClass('issues_filter_active');
+        $("#status_id").removeClass('issues_filter_active');
+        $("#done_ratio").removeClass('issues_filter_active');
+        $("#test").removeClass('issues_filter_active');
         remote_function();
     }
 </script>
@@ -121,208 +207,124 @@
 <div class="clear mb5">
   <div class="issues_statistics fl clear">
     <ul>
-      <li>所有<a href="javascript:void(0);" class="issues_greycirbg_btn ">5713</a></li>
-      <li>开启<a href="javascript:void(0);" class="issues_greycirbg_btn ">5713</a></li>
-      <li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn ">5713</a></li>
+      <li>所有<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issues_filter.count %></a></li>
+      <li>开启<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_open_count %></a></li>
+      <li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_close_count %></a></li>
     </ul>
   </div><!--issues_statistics end-->
-  <a href="javascript:void(0);" class="sy_btn_green fr " >新建</a>
-</div>
-<div class="clear mb10">
-  <div class="hw_search_box fl ">
-    <input class="hw_search-input" placeholder="输入Issue名称进行搜索" type="text">
-    <a href="javascript:void(0);" class="hw_btn_search"></a>
-  </div>
-  <a href="javascript:void(0);" class="sy_btn_grey fl ml5">清除</a>
-  <div class="issues_filter_data fr">
-    <input type="text"  placeholder="开始日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl" style="border-right:none;"></a>
-    <input type="text"  placeholder="结束日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl"></a>
-  </div>
+  <a href="<%= new_project_issue_path(@project)%>" class="sy_btn_green fr " >新建</a>
 </div>
+<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+    <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'xls', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
+        <%= hidden_field_tag 'set_filter', '1' %>
+        <%= hidden_field_tag 'export_issue_hidden', '0' %>
+        <div class="clear mb10">
+          <div class="hw_search_box fl ">
+            <input class="hw_search-input" placeholder="输入Issue名称进行搜索" type="text" id="v_subject"  name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
+            <a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a>
+          </div>
+          <a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="all_reset_form();">清除</a>
 
-<div class="issues_con_list" style="position: relative;">
-  <ul id="issues_list_nav" >
-    <li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);">
-      <a href="javascript:void(0);" id="issues_type_1" >搜索结果<span class="issues_nav_tag ml5">210</span></a>
-    </li>
-    <li id="issues_list_nav_2" onclick="HoverLi(2);">
-      <a href="javascript:void(0);" id="issues_type_2" >指派给我<span class="issues_nav_tag ml5">25</span></a>
-    </li>
-    <li id="issues_list_nav_3" onclick="HoverLi(3);">
-      <a href="javascript:void(0);" id="issues_type_3" >我的发布<span class="issues_nav_tag ml5">5</span></a>
-    </li>
-    <div class="cl"></div>
-  </ul>
-  <div class="issues_filter ">
-    <form class="issues_form_filter mt5 mr5">
+          <div class="calendar_div fr">
+            <input id="issue_date_end_issue_export" name="issue_create_date_end" nhname="date_val" type="hidden"/>
+            <input type="text" nhname="date_show" id="issue_create_date_end_show" class="InputBox fl W120 calendar_input" readonly="readonly" size="13" placeholder="结束日期">
+            <%= calendar_for('issue_create_date_end_show')%>
+          </div>
+          <div class="calendar_div fr">
+            <input id="issue_date_start_issue_export"  name="issue_create_date_start" nhname="date_val" type="hidden"/>
+            <input type="text" nhname="date_show" id="issue_create_date_start_show" class="InputBox fl W120 calendar_input" readonly="readonly" size="13" placeholder="开始日期">
+            <%= calendar_for('issue_create_date_start_show')%>
+          </div>
+        </div>
 
-      <select  placeholder=" 发布人" class="fl "  >
-        <option value="0" selected="selected">发布人</option>
-        <option value="8166">123</option>
-        <option value="8166">123</option>
-      </select>
-      <select  placeholder=" 指派给" class="fl">
-        <option value="0" selected="selected">指派给</option>
-        <option value="8166">15607313899@163.com</option>
-        <option value="8166">15607313899@163.com</option>
-      </select>
-      <select  placeholder=" 类型" class="fl issues_filter_select_min issues_filter_active"  >
-        <option value="0" selected="selected">类型</option>
-        <option value="8166">缺陷</option>
-        <option value="8166">功能</option>
-        <option value="8166">支持</option>
-        <option value="8166">任务</option>
-        <option value="8166">周报</option>
-      </select>
+        <div class="issues_con_list" style="position: relative;">
+          <ul id="issues_list_nav" >
+            <li id="issues_list_nav_1" onclick="HoverLi(1);all_reset_form();" class="issues_nav_hover">
+              <a href="javascript:void(0);" onclick="all_reset_form();"  id="issues_type_1" >搜索结果</a>
+              <span id="issue_filter_all"><%= render :partial => "issues/issue_filter_all" %></span>
+            </li>
+            <li id="issues_list_nav_2" onclick="HoverLi(2);">
+                  <a href="javascript:void(0);" onclick="switch_assign_to(<%= User.current.id %>)" id="issues_type_2" >指派给我
+                    <span id="issue_assigned_count"><%= render :partial => "issues/issue_filter" %></span>
+                  </a>
+                </li>
+                <li id="issues_list_nav_3" onclick="HoverLi(3);">
+                  <a href="javascript:void(0);" onclick="createByMe(<%= User.current.id %>)" id="issues_type_3" >我的发布
+                    <span id="issue_author_count"><%= render :partial => "issues/issue_filter_author" %></span>
+                    </a>
+                </li>
+            <div class="cl"></div>
 
-      <select  placeholder=" 优先度" class="fl issues_filter_select_min02"  >
-        <option value="0" selected="selected">优先度</option>
-        <option value="8166">0</option>
-        <option value="8166">1</option>
-      </select>
-      <select  placeholder=" 里程碑" class="fl issues_filter_select_max mr5 " >
-        <option value="0" selected="selected">里程碑</option>
-        <option value="8166">20160505</option>
-        <option value="8166">20160505</option>
-      </select>
-      <select  placeholder=" 状态" class="fl issues_filter_select_min">
-        <option value="0" selected="selected">状态</option>
-        <option value="8166">草稿</option>
-        <option value="8166">新增</option>
-        <option value="8166">变更</option>
-        <option value="8166">已评</option>
-        <option value="8166">着手</option>
-        <option value="8166">完成</option>
-        <option value="8166">反馈</option>
-        <option value="8166">关闭</option>
-        <option value="8166">拒绝</option>
-      </select>
-      <select  placeholder=" 完成度" class="fl issues_filter_select_min02">
-        <option value="0" selected="selected">完成度</option>
-        <option value="8166">0%</option>
-        <option value="8166">10%</option>
-        <option value="8166">20%</option>
-        <option value="8166">30%</option>
-        <option value="8166">40%</option>
-        <option value="8166">50%</option>
-        <option value="8166">60%</option>
-        <option value="8166">70%</option>
-        <option value="8166">80%</option>
-        <option value="8166">90%</option>
-        <option value="8166">100%</option>
-      </select>
-      <select  placeholder=" 排序" class="fl issues_filter_select_min">
-        <option value="0" selected="selected">排序</option>
-        <option value="8166">最新创建</option>
-        <option value="8166">最早创建</option>
-        <option value="8166">最近更新</option>
-        <option value="8166">最早更新</option>
-      </select>
-    </form>
-    <div class="cl"></div>
+
+          </ul>
+
+
+          <div class="issues_filter ">
+            <div class="issues_form_filter mt5 mr5">
+              <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [User.find(c.user_id).show_name, c.user_id]}.unshift(["发布人",0]),
+                              { :include_blank => false,:selected=>@author_id ? @author_id : 0},
+                              {:onchange=>"remote_function();add_style();",:id=>"author_id",:name=>"author_id",:class=>"fl "}
+                      )
+              %>
+
+              <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
+                          { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
+                          },
+                          {:onchange=>"remote_function();add_style();",:id=>"assigned_to_id",:name=>"assigned_to_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();add_style();", :id => "tracker_id", :name => "tracker_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();add_style();",:id=>"priority_id",:name=>"priority_id",:class=>"fl issues_filter_select_min02"}
+                      )
+              %>
+
+              <%= select(:issue, :fixed_version, options_for_version_isuue_list(@project),
+                         {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0},
+                         {:onchange => "remote_function();add_style();", :id => "fixed_version_id", :name => "fixed_version_id", :class => "fl issues_filter_select_max mr5"}) %>
+
+              <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
+                          { :include_blank => false,:selected=>@status_id ? @status_id : 0
+                          },
+                          {:onchange=>"remote_function();add_style();",:id=>"status_id",:name=>"status_id",:class=>"fl issues_filter_select_min"}
+                  )
+              %>
+
+              <%= 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();add_style();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl issues_filter_select_min02"}) %>
+
+              <%= select(:issue, :test, [["最新创建",1],["最早创建",2],["最近更新",3],["最早更新", 4]].unshift(["排序",0]),
+                         {:include_blank => false, :selected => @test ? @test : 0 },
+                         {:onchange => "remote_function();add_style();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %>
+
+            </div>
+            <div class="cl"></div>
+          </div><!--issues_filter end-->
+    <% end %>
+<% end %>
+<% if @issues.empty? %>
+    <p class="nodata"><%= l(:label_no_data) %></p>
+<% else %>
+    <div id="issue_list">
+      <%= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
+    </div>
+<% end %>
+<%#= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
+</div><!--issues_con_list end-->
+ <div class="cl"></div>
   </div><!--issues_filter end-->
   <div id="issues_list_content_1">
-    <div class="issues_list_box clear">
-      <div class="issues_ciricons fl "><span class="issues_ciricons_01 "></span></div>
-      <div class=" fl ml5">
-        <div class="issues_list_titlebox clear">
-          <a href="javascript:void(0);"  class="issues_list_title fl">管理员页面：用户列表中显示如图用户工作单位为空工作单位为空工作单位为空工作单位为空工作单位为空</a>
-          <div class="cl"></div>
-        </div>
-        <div class="issues_list_small">
-          <p class="fl issues_list_name" ><span class="mr5">2016-09-01 12:12 </span>发布</p>
-          <p class="fl ml10"> <span class="mr5">2016-09-16 12:12  </span>更新</p>
-        </div>
-      </div>
-      <ul class="issues_list_txt fr">
-        <li class=" c_grey">shashashashash</li>
-        <li class="c_grey ">suntaoashashashash</li>
-        <li class="issues_list_min c_grey mr5">需求</li>
-        <li class="c_grey issues_list_min mr10"> 正常 </li>
-        <li class="c_grey issues_list_max"> 201612ashashashash</li>
-        <li class="issues_list_min c_grey mr10">草稿</li>
-        <li class="c_green issues_list_min mr5">90%</li>
-        <li class="issues_list_min">
-          <a href="javascript:void(0);" class="issues_icons_mes fl mr5 ml5 mt3"></a>
-          <a href="javascript:void(0);"  class="fl mt2">3</a>
-        </li>
-      </ul>
-    </div>
-    <div class="issues_list_box clear">
-      <div class="issues_ciricons fl "><span class="issues_ciricons_01 "></span></div>
-      <div class=" fl ml5">
-        <div class="issues_list_titlebox clear">
-          <a href="javascript:void(0);"  class="issues_list_title fl">管理员页面：用户列表中显示如图用户工作单位为空</a>
-          <div class="cl"></div>
-        </div>
-        <div class="issues_list_small">
-          <p class="fl issues_list_name" ><span class="mr5">2016-09-01 12:12 </span>发布</p>
-          <p class="fl ml10"> <span class="mr5">2016-09-16 12:12  </span>更新</p>
-        </div>
-      </div>
-      <ul class="issues_list_txt fr">
-        <li class=" c_grey">shash</li>
-        <li class="c_grey ">suntao</li>
-        <li class="issues_list_min c_grey mr5">需求</li>
-        <li class="c_grey issues_list_min mr10"> 正常 </li>
-        <li class="c_grey issues_list_max"> 201612</li>
-        <li class="issues_list_min c_grey mr10">草稿</li>
-        <li class="c_green issues_list_min mr5">90%</li>
-        <li class="issues_list_min">
-          <a href="javascript:void(0);" class="issues_icons_mes fl mr5 ml5 mt3"></a>
-          <a href="javascript:void(0);"  class="fl mt2">3</a>
-        </li>
-      </ul>
-    </div>
-    <div class="issues_list_box clear">
-      <div class="issues_ciricons fl "><span class="issues_ciricons_02 "></span></div>
-      <div class=" fl ml5">
-        <div class="issues_list_titlebox clear">
-          <a href="javascript:void(0);"  class="issues_list_title fl">管理员页面：用户列表中显示如图用户工作单位为空</a>
-        </div>
-        <div class="issues_list_small">
-          <p class="fl issues_list_name" ><span class="mr5">2016-09-01 12:12 </span>发布</p>
-          <p class="fl ml10"> <span class="mr5">2016-09-16 12:12  </span>更新</p>
-        </div>
-      </div>
-      <ul class="issues_list_txt fr">
-        <li class=" c_grey">shash</li>
-        <li class="c_grey ">suntao</li>
-        <li class="issues_list_min c_grey mr5">需求</li>
-        <li class="c_grey issues_list_min mr10"> 正常 </li>
-        <li class="c_grey issues_list_max"> 201612</li>
-        <li class="issues_list_min c_grey mr10">草稿</li>
-        <li class="c_green issues_list_min mr5">90%</li>
-        <li class="issues_list_min">
-          <a href="javascript:void(0);" class="issues_icons_mes fl mr5 ml5 mt3"></a>
-          <a href="javascript:void(0);"  class="fl mt2">3</a>
-        </li>
-      </ul>
-
-    </div>
-    <a href="#" class="btn_newpro_grey fl ml15 mt15" alt="导出">导出</a>
-    <a href="#" class="btn_newpro_grey fl ml5 mt15" alt="统计">统计</a>
-    <div class="fr pages_right ">
-      <a href="javascript:void(0);" class="pages-big" >上一页</a>
-      <a href="javascript:void(0);" class="active " >1</a>
-      <a href="javascript:void(0);" >2</a>
-      <a href="javascript:void(0);" >3</a>
-      <a href="javascript:void(0);" >...</a>
-      <a href="javascript:void(0);" >31</a>
-      <a href="javascript:void(0);" class="pages-big" >下一页</a>
-      <div class="cl"></div>
-    </div><!--翻页 end-->
-    <div class="cl"></div>
-
   </div><!--issues_list_content_1 end-->
-
   <div id="issues_list_content_2" class="undis">
-    ddd
-
   </div><!--issues_list_content_2 end-->
   <div id="issues_list_content_3" class="undis">
-
-    eee
   </div><!--issues_list_content_3 end-->
 </div><!--issues_con_list end-->
 
@@ -344,6 +346,7 @@
 
 
 
+
 <div class="homepageRight mt0 ml10" >
   <div class="issues_con fl">
     <div class="clear mb5">
@@ -355,7 +358,7 @@
           <li>关闭<a  class="issues_greycirbg_btn "><%#= @issues_filter_author_count %><%= @issue_close_count  %></a></li>
         </ul>
       </div><!--issues_statistics end-->
-      <!--<input type="button"  class="hw_btn_blue  fr" value="导出EXCEL" onclick="remote_function_export('<%= @project.id %>')">-->
+      <!--<input type="button"  class="hw_btn_blue  fr" value="导出EXCEL" onclick="remote_function_export('<%#= @project.id %>')">-->
       <a href="<%=project_issues_path(:project_id => @project, :format => 'xls', :export => true, :set_filter => "1")%>" id="sendexcel" class="hw_btn_blue  fr" alt="导出EXCEL" onclick="remote_function_export('<%= @project.id %>')">导出EXCEL</a>
     </div>
     <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>