diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 70d60583e..1f9f57b91 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -29,7 +29,16 @@ class VersionsController < ApplicationController order_type = params[:order_type] || "desc" version_issues = @version.issues.issue_includes.order("#{order_name} #{order_type}") + + status_type = params[:status_type] || "1" @close_issues_size = version_issues.where(status_id: 5).size + @open_issues_size = version_issues.size - @close_issues_size + + if status_type.to_s == "1" #表示开启中的 + version_issues = version_issues.where.not(status_id: 5) + else + version_issues = version_issues.where(status_id: 5) + end @page = params[:page] || 1 @limit = params[:limit] || 15 diff --git a/app/views/versions/show.json.jbuilder b/app/views/versions/show.json.jbuilder index 206b1faaf..b8e63e6cc 100644 --- a/app/views/versions/show.json.jbuilder +++ b/app/views/versions/show.json.jbuilder @@ -1,5 +1,6 @@ json.partial! "commons/success" json.issues_count @version_issues_size +json.open_issues_count @open_issues_size json.close_issues_count @close_issues_size json.user_name @version.version_user.try(:show_real_name) json.user_login @version.version_user.try(:login)