diff --git a/app/controllers/issue_tags_controller.rb b/app/controllers/issue_tags_controller.rb index 7b3b54a89..011735ff7 100644 --- a/app/controllers/issue_tags_controller.rb +++ b/app/controllers/issue_tags_controller.rb @@ -17,7 +17,7 @@ class IssueTagsController < ApplicationController 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) color = params[:color] || "#ccc" @@ -60,8 +60,8 @@ class IssueTagsController < ApplicationController end def update - title = params[:name] - desc = params[:description] + title = params[:name].to_s.strip.first(15) + desc = params[:description].to_s.first(30) color = params[:color] || "#ccc" tag_params = { diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 96e186b42..6ea8fb8ef 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -15,6 +15,7 @@ class IssuesController < ApplicationController include TagChosenHelper 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?) issues = @project.issues.issue_issue.issue_index_includes issues = issues.where(is_private: false) unless @user_admin_or_member diff --git a/app/views/issues/index.json.jbuilder b/app/views/issues/index.json.jbuilder index 0f778fafe..8db3524ed 100644 --- a/app/views/issues/index.json.jbuilder +++ b/app/views/issues/index.json.jbuilder @@ -7,6 +7,7 @@ json.my_published_count @my_published.size json.search_count @issues_size json.limit @limit json.user_admin_or_member @user_admin_or_member +json.user_operate_issue @user_operate_issue json.issues do json.array! @issues.to_a do |issue|