Gitlink
/
forgeplus
33
1
Fork 58
Code Issues 1 Pull Requests 1 Packages Releases 15 Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2022-11-10 11:03:08 +08:00
parent e92588cf6d 570f664c27
commit 6dc06fc088
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issue_tags_controller.rb
View File

@ -7,7 +7,7 @@ class IssueTagsController < ApplicationController
def index
issue_tags = @project.issue_tags.reorder("#{order_name} #{order_type}")
issue_tags = @project.issue_tags.includes(:issues).reorder("issue_tags.#{order_name} #{order_type}")
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
@page = params[:page] || 1
@limit = params[:limit] || 15

3
app/views/issue_tags/index.json.jbuilder
View File

@ -4,6 +4,7 @@ json.user_admin_or_member @user_admin_or_member
json.issue_tags do
json.array! @issue_tags.each.to_a do |tag|
json.extract! tag, :id, :name, :description, :color, :issues_count, :project_id, :gid, :gitea_url
json.extract! tag, :id, :name, :description, :color, :project_id, :gid, :gitea_url
json.issues_count tag.issues_count - tag.issues.closed.size
end
end