fix: change issue navbar count
This commit is contained in:
		
							parent
							
								
									be63beb78b
								
							
						
					
					
						commit
						80c1573aea
					
				| 
						 | 
				
			
			@ -17,13 +17,17 @@ class IssuesController < ApplicationController
 | 
			
		|||
    issues = @project.issues.issue_issue.issue_index_includes
 | 
			
		||||
    issues = issues.where(is_private: false) unless @user_admin_or_member
 | 
			
		||||
 | 
			
		||||
    @all_issues_size = issues.size
 | 
			
		||||
    @open_issues_size = issues.where.not(status_id: 5).size
 | 
			
		||||
    @close_issues_size = issues.where(status_id: 5).size
 | 
			
		||||
    @assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size
 | 
			
		||||
    @my_published_size = issues.where(author_id: current_user&.id).size
 | 
			
		||||
    @all_issues = issues
 | 
			
		||||
    @filter_issues = @all_issues
 | 
			
		||||
    @filter_issues = @filter_issues.where.not(status_id: 5) if params[:status_type].to_i == 1
 | 
			
		||||
    @filter_issues = @filter_issues.where(status_id: 5) if params[:status_type].to_i == 2
 | 
			
		||||
    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
 | 
			
		||||
    @open_issues = @all_issues.where.not(status_id: 5)
 | 
			
		||||
    @close_issues = @all_issues.where(status_id: 5)
 | 
			
		||||
    @assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
 | 
			
		||||
    @my_published = @filter_issues.where(author_id: current_user&.id)
 | 
			
		||||
    scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
 | 
			
		||||
    @issues_size = scopes.size
 | 
			
		||||
    @issues_size = @filter_issues.size
 | 
			
		||||
    @issues = paginate(scopes)
 | 
			
		||||
 | 
			
		||||
    respond_to do |format|
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,9 +1,9 @@
 | 
			
		|||
json.partial! "commons/success"
 | 
			
		||||
json.all_count @all_issues_size
 | 
			
		||||
json.open_count @open_issues_size
 | 
			
		||||
json.close_count @close_issues_size
 | 
			
		||||
json.assign_me_count @assign_to_me_size
 | 
			
		||||
json.my_published_count @my_published_size
 | 
			
		||||
json.all_count @all_issues.size
 | 
			
		||||
json.open_count @open_issues.size
 | 
			
		||||
json.close_count @close_issues.size
 | 
			
		||||
json.assign_me_count @assign_to_me.size
 | 
			
		||||
json.my_published_count @my_published.size
 | 
			
		||||
json.search_count @issues_size
 | 
			
		||||
json.limit @limit
 | 
			
		||||
json.user_admin_or_member @user_admin_or_member
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue