fix: labels limit and issues operate field
This commit is contained in:
parent
74e5fa0e31
commit
7a93db9ed2
|
@ -17,7 +17,7 @@ class IssueTagsController < ApplicationController
|
||||||
|
|
||||||
|
|
||||||
def create
|
def create
|
||||||
title = params[:name].to_s.strip.first(10)
|
title = params[:name].to_s.strip.first(15)
|
||||||
desc = params[:description].to_s.first(30)
|
desc = params[:description].to_s.first(30)
|
||||||
color = params[:color] || "#ccc"
|
color = params[:color] || "#ccc"
|
||||||
|
|
||||||
|
@ -60,8 +60,8 @@ class IssueTagsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
title = params[:name]
|
title = params[:name].to_s.strip.first(15)
|
||||||
desc = params[:description]
|
desc = params[:description].to_s.first(30)
|
||||||
color = params[:color] || "#ccc"
|
color = params[:color] || "#ccc"
|
||||||
|
|
||||||
tag_params = {
|
tag_params = {
|
||||||
|
|
|
@ -15,6 +15,7 @@ class IssuesController < ApplicationController
|
||||||
include TagChosenHelper
|
include TagChosenHelper
|
||||||
|
|
||||||
def index
|
def index
|
||||||
|
@user_operate_issue = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
|
||||||
@user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user) || @project.is_public?)
|
@user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user) || @project.is_public?)
|
||||||
issues = @project.issues.issue_issue.issue_index_includes
|
issues = @project.issues.issue_issue.issue_index_includes
|
||||||
issues = issues.where(is_private: false) unless @user_admin_or_member
|
issues = issues.where(is_private: false) unless @user_admin_or_member
|
||||||
|
|
|
@ -7,6 +7,7 @@ json.my_published_count @my_published.size
|
||||||
json.search_count @issues_size
|
json.search_count @issues_size
|
||||||
json.limit @limit
|
json.limit @limit
|
||||||
json.user_admin_or_member @user_admin_or_member
|
json.user_admin_or_member @user_admin_or_member
|
||||||
|
json.user_operate_issue @user_operate_issue
|
||||||
|
|
||||||
json.issues do
|
json.issues do
|
||||||
json.array! @issues.to_a do |issue|
|
json.array! @issues.to_a do |issue|
|
||||||
|
|
Loading…
Reference in New Issue