|
|
#coding=utf-8
|
|
|
# Redmine - project management software
|
|
|
# Copyright (C) 2006-2013 Jean-Philippe Lang
|
|
|
#
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
# modify it under the terms of the GNU General Public License
|
|
|
# as published by the Free Software Foundation; either version 2
|
|
|
# of the License, or (at your option) any later version.
|
|
|
#
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
# GNU General Public License for more details.
|
|
|
#
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
# along with this program; if not, write to the Free Software
|
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
|
class IssuesController < ApplicationController
|
|
|
layout 'base_projects'#Added by young
|
|
|
default_search_scope :issues
|
|
|
|
|
|
before_filter :authorize1, :only => [:show]
|
|
|
before_filter :find_issue, :only => [:show, :edit, :update,:add_journal, :add_journal_in_org]
|
|
|
before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
|
|
|
before_filter :find_project, :only => [:new, :create, :update_form, :issue_commits, :commit_for_issue, :issue_commit_delete]
|
|
|
#before_filter :authorize, :except => [:index, :show]
|
|
|
before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org,:delete_journal,:reply,:add_reply, :issue_commits, :commit_for_issue, :issue_commit_delete]
|
|
|
|
|
|
before_filter :find_optional_project, :only => [:index]
|
|
|
before_filter :check_for_default_issue_status, :only => [:new, :create]
|
|
|
before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
|
|
|
accept_rss_auth :index, :show
|
|
|
accept_api_auth :index, :show, :create, :update, :destroy
|
|
|
|
|
|
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
|
|
|
|
|
|
helper :journals
|
|
|
helper :projects
|
|
|
include ProjectsHelper
|
|
|
helper :custom_fields
|
|
|
include CustomFieldsHelper
|
|
|
helper :issue_relations
|
|
|
include IssueRelationsHelper
|
|
|
helper :watchers
|
|
|
include WatchersHelper
|
|
|
helper :attachments
|
|
|
include AttachmentsHelper
|
|
|
helper :queries
|
|
|
include QueriesHelper
|
|
|
helper :repositories
|
|
|
include RepositoriesHelper
|
|
|
helper :sort
|
|
|
include SortHelper
|
|
|
include IssuesHelper
|
|
|
helper :timelog
|
|
|
include Redmine::Export::PDF
|
|
|
helper :project_score
|
|
|
include ApplicationHelper
|
|
|
|
|
|
# issue和代码提交id关联模块 --> over
|
|
|
# 获取某个项目的commit_ids
|
|
|
def issue_commits
|
|
|
begin
|
|
|
return render_404 if @project.gpid.nil?
|
|
|
@issue_commit_ids = (params[:issue_commit_ids].is_a?(Array) ? params[:issue_commit_ids] : params[:issue_commit_ids].split(",")) unless params[:issue_commit_ids].nil?
|
|
|
search = params[:search].to_s.strip
|
|
|
@type = params[:type]
|
|
|
limit = 8
|
|
|
g = Gitlab.client
|
|
|
g_project = g.project(@project.gpid)
|
|
|
rev = params[:branch].nil? ? g_project.default_branch : params[:branch]
|
|
|
@project_branches = g.branches(@project.gpid)
|
|
|
@branch_names = @project_branches.map{|b| b.name}
|
|
|
@default_branch = g_project.default_branch
|
|
|
# 搜索的分页需要单独处理，因为搜索不容易获取总数
|
|
|
if search.present?
|
|
|
@commits = g.commits(@project.gpid, ref_name:rev, :search => search)
|
|
|
@commits_count = @commits.count
|
|
|
else
|
|
|
@commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s, ref_name:rev, :search => search)
|
|
|
@commits_count = g.user_static(@project.gpid, :rev => rev).count
|
|
|
end
|
|
|
@commits_pages = Paginator.new @commits_count, limit, params['page'] || 1
|
|
|
@offset ||= @commits_pages.offset
|
|
|
@commits = paginateHelper @commits,limit
|
|
|
rescue Exception => e
|
|
|
puts e
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# 选择对应的Commit
|
|
|
def commit_for_issue
|
|
|
history_commit_ids = params[:issue_for_commit_ids].split(",") unless params[:issue_for_commit_ids].nil?
|
|
|
@issue_commit_ids = (history_commit_ids.blank? ? params[:checkbox1] : params[:checkbox1] | history_commit_ids).uniq
|
|
|
end
|
|
|
|
|
|
def issue_commit_delete
|
|
|
commit_id = params[:commit_id].split(",")
|
|
|
issue_commit_ids = params[:issue_commit_ids]
|
|
|
# issue_id存在则为issue详情或者编辑的时候，否则为新建Issue
|
|
|
# 编辑和详情的时候需要在数据库中删除记录，新建的时候在内存中删除
|
|
|
if params[:issue_id]
|
|
|
commit_issue = CommitIssues.where(:commit_id => commit_id, :issue_id => params[:issue_id], :project_id => @project.id).first
|
|
|
commit_issue.delete if commit_issue
|
|
|
end
|
|
|
@issue_commit_ids = issue_commit_ids - commit_id
|
|
|
end
|
|
|
# over
|
|
|
|
|
|
def index
|
|
|
# 顶部导航
|
|
|
@project_menu_type = 2
|
|
|
# 为了性能所有用了两种模式，issue的@query查询所有的没有优势
|
|
|
# 但是对过滤条件很有有时
|
|
|
if params[:set_filter] != "1"
|
|
|
@project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'
|
|
|
if User.current.member_of?(@project)
|
|
|
@issues_filter = Issue.where(:project_id => @project.id).order('updated_on desc')
|
|
|
else
|
|
|
@issues_filter = Issue.where(:project_id => @project.id, :is_private => 0).order('updated_on desc')
|
|
|
end
|
|
|
open_and_close_num(@project)
|
|
|
@issue_count = @issues_filter.count
|
|
|
@limit = 10
|
|
|
@is_remote = true
|
|
|
@issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1
|
|
|
@offset ||= @issue_pages.offset
|
|
|
@issues = paginateHelper @issues_filter, @limit
|
|
|
respond_to do |format|
|
|
|
format.js
|
|
|
format.html { render :template => 'issues/index', :layout => @project_base_tag }#by young
|
|
|
format.api {Issue.load_visible_relations(@issues) if include_in_api_response?('relations')}
|
|
|
format.xls {filename = "#{@project.name.to_s}_#{l(:label_issue_list_xls)}.xls"
|
|
|
send_data(issue_list_xls(@issues_filter), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
|
|
|
}
|
|
|
end
|
|
|
else
|
|
|
retrieve_query
|
|
|
sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
|
|
|
sort_update(@query.sortable_columns)
|
|
|
@query.sort_criteria = sort_criteria.to_a
|
|
|
@project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'
|
|
|
if @query.valid?
|
|
|
@tracker_id = params[:tracker_id]
|
|
|
@assign_to_id = params[:assigned_to_id]
|
|
|
@author_id = params[:author_id]
|
|
|
@priority_id = params[:priority_id]
|
|
|
@status_id = params[:status_id]
|
|
|
@subject = params[:subject]
|
|
|
@done_ratio = params[:done_ratio]
|
|
|
@fixed_version_id = params[:fixed_version_id]
|
|
|
@issue_count = @query.issue_count
|
|
|
@test = params[:test]
|
|
|
@project_sort = 'issues.updated_on desc'
|
|
|
|
|
|
if params[:test] != "0"
|
|
|
case @test
|
|
|
when "1"
|
|
|
@project_sort = 'issues.created_on desc'
|
|
|
when "2"
|
|
|
@project_sort = 'issues.created_on asc'
|
|
|
when "3"
|
|
|
@project_sort = 'issues.updated_on desc'
|
|
|
when "4"
|
|
|
@project_sort = 'issues.updated_on asc'
|
|
|
end
|
|
|
end
|
|
|
open_and_close_num(@project)
|
|
|
@issues_filter_assign_count = @query.issues.select{|issue| issue.assigned_to_id == User.current.id }.count
|
|
|
@issues_filter_author_count = @query.issues.select{|issue| issue.author_id == User.current.id }.count
|
|
|
@issues_filter = @query.issues(:order => @project_sort)
|
|
|
@limit = 10
|
|
|
@is_remote = true
|
|
|
@issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1
|
|
|
@offset ||= @issue_pages.offset
|
|
|
@issues = paginateHelper @issues_filter, @limit
|
|
|
respond_to do |format|
|
|
|
format.js
|
|
|
format.html { render :template => 'issues/index', :layout => @project_base_tag }#by young
|
|
|
format.api {Issue.load_visible_relations(@issues) if include_in_api_response?('relations')}
|
|
|
# format.json { render :json => @issues.map { |issue| issue.to_json}} #:json => @issues.map { |issue| issue.to_json}
|
|
|
format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
|
|
|
format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') }
|
|
|
format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') }
|
|
|
format.xls {filename = "#{@project.name.to_s}_#{l(:label_issue_list_xls)}.xls"
|
|
|
send_data(issue_list_xls(@issues_filter), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
|
|
|
}
|
|
|
end
|
|
|
else
|
|
|
respond_to do |format|
|
|
|
format.html { render(:template => 'issues/index', :layout => @project_base_tag) }#by young
|
|
|
format.any(:atom, :csv, :pdf) { render(:nothing => true) }
|
|
|
format.api { render_validation_errors(@query) }
|
|
|
format.js
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
rescue ActiveRecord::RecordNotFound
|
|
|
render_404
|
|
|
end
|
|
|
|
|
|
# 获取issue的开启统计数
|
|
|
def open_and_close_num project
|
|
|
if User.current.member_of?(project)
|
|
|
@issue_open_count = Issue.where("project_id=#{project.id} and status_id in (1,2,3,4,6)").count
|
|
|
@issue_close_count = Issue.where(:project_id => project.id, :status_id => 5 ).count
|
|
|
else
|
|
|
@issue_open_count = Issue.where("project_id=#{project.id} and status_id in (1,2,3,4,6) and is_private = 0").count
|
|
|
@issue_close_count = Issue.where(:project_id => project.id, :status_id => 5, :is_private => 0).count
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def show
|
|
|
# 顶部导航
|
|
|
@project_menu_type = 2
|
|
|
# 打开编辑内容
|
|
|
@is_edit = true unless params[:edit].nil?
|
|
|
# 当前用户查看指派给他的缺陷消息，则设置消息为已读
|
|
|
query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
|
|
|
query.update_attribute(:viewed, true) unless query.nil?
|
|
|
# issue 关联的commit
|
|
|
commit_issues = CommitIssues.where(:issue_id => @issue.id, :project_id => @issue.project_id)
|
|
|
@issue_commit_ids = commit_issues.map{|commit_issue| commit_issue.commit_id}
|
|
|
# issue 新建的at消息
|
|
|
User.current.at_messages.unviewed('Issue', @issue.id).each {|x| x.viewed!}
|
|
|
# 回复的at消息
|
|
|
@issue.journals.each do |j|
|
|
|
User.current.at_messages.unviewed('Journal', j.id).each {|x| x.viewed!}
|
|
|
end
|
|
|
|
|
|
|
|
|
@jour_reply = Journal.new
|
|
|
@journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id desc").all
|
|
|
@journals = get_no_children_comments_all @journals
|
|
|
@journals.each_with_index {|j,i| j.indice = i+1}
|
|
|
@journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
|
|
|
@journals.reverse! if User.current.wants_comments_in_reverse_order?
|
|
|
|
|
|
@changesets = @issue.changesets.visible.all
|
|
|
@changesets.reverse! if User.current.wants_comments_in_reverse_order?
|
|
|
|
|
|
@relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
|
|
|
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
|
|
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
|
|
|
@priorities = IssuePriority.active
|
|
|
@time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
|
|
|
|
|
|
@project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
|
|
|
@available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
|
|
|
@journal = Journal.new(:journalized => @issue)
|
|
|
|
|
|
respond_to do |format|
|
|
|
format.html {
|
|
|
retrieve_previous_and_next_issue_ids
|
|
|
render :template => 'issues/show', :layout => @project_base_tag#by young
|
|
|
}
|
|
|
format.js
|
|
|
format.api
|
|
|
format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
|
|
|
format.pdf {
|
|
|
pdf = issue_to_pdf(@issue, :journals => @journals)
|
|
|
send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
|
|
|
}
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# Add a new issue
|
|
|
# The new issue will be created from an existing one if copy_from parameter is given
|
|
|
def new
|
|
|
# 顶部导航
|
|
|
@project_menu_type = 2
|
|
|
|
|
|
respond_to do |format|
|
|
|
format.html { render :action => 'new', :layout => 'base_projects' }
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# 用户发布新issue
|
|
|
def create
|
|
|
call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
|
|
|
@issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
|
|
|
# 给该issue在它所在的项目中所有的issues中所在的位置给一个序号
|
|
|
@issue.project_issues_index = @issue.project.issues.last.nil? ? 1 : @issue.project.issues.last.project_issues_index + 1
|
|
|
@issue.fixed_version_id = nil if @issue.fixed_version_id == 0
|
|
|
@issue.assigned_to_id = nil if @issue.assigned_to_id == 0
|
|
|
if @issue.save
|
|
|
# 关联commmit
|
|
|
update_issue_commit params[:commit_ids]
|
|
|
#params[:issue][:assigned_to_id] = nil if params[:issue][:assigned_to_id].to_i == 0
|
|
|
senduser = User.find(params[:issue][:assigned_to_id])
|
|
|
issue_id = @issue.id
|
|
|
issue_title = params[:issue][:subject]
|
|
|
priority_id = params[:issue][:priority_id]
|
|
|
|
|
|
ps = ProjectsService.new
|
|
|
if senduser.id != User.current.id
|
|
|
ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
|
|
|
end
|
|
|
call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
|
|
|
respond_to do |format|
|
|
|
format.html {
|
|
|
render_attachment_warning_if_needed(@issue)
|
|
|
#flash[:notice] = l(:label_successful_create)
|
|
|
#flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject))
|
|
|
#flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
|
|
|
if params[:continue]
|
|
|
attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
|
|
|
redirect_to new_project_issue_url(@issue.project, :issue => attrs)
|
|
|
else
|
|
|
redirect_to issue_url(@issue.id)
|
|
|
end
|
|
|
}
|
|
|
format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
|
|
|
end
|
|
|
return
|
|
|
else
|
|
|
respond_to do |format|
|
|
|
format.html { render :action => 'new' }
|
|
|
format.api { render_validation_errors(@issue) }
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def edit
|
|
|
# 修改实例变量的值
|
|
|
return unless update_issue_from_params
|
|
|
# issue 关联的commit
|
|
|
commit_issues = CommitIssues.where(:issue_id => @issue.id, :project_id => @issue.project_id)
|
|
|
@issue_commit_ids = commit_issues.map{|commit_issue| commit_issue.commit_id}
|
|
|
|
|
|
@project_menu_type = 2
|
|
|
respond_to do |format|
|
|
|
format.html {render :layout => 'base_projects' }#added by young
|
|
|
format.xml { }
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# 用户编辑更改issue
|
|
|
def update
|
|
|
# params[:assigned_to_id] = nil if params[:assigned_to_id].to_i == 0
|
|
|
# params[:fixed_version_id] = nil if params[:fixed_version_id].to_i == 0
|
|
|
if params[:issue_detail]
|
|
|
issue = Issue.find(params[:id])
|
|
|
issue = update_user_issue_detail(issue, params)
|
|
|
@saved = update_user_issue_detail(issue, params)
|
|
|
return
|
|
|
else
|
|
|
# 修改实例变量的值
|
|
|
return unless update_issue_from_params
|
|
|
@issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
|
|
|
@issue.assigned_to_id = nil if @issue.assigned_to_id == 0
|
|
|
@issue.fixed_version_id = nil if @issue.fixed_version_id == 0
|
|
|
saved = false
|
|
|
begin
|
|
|
@saved = @issue.save_issue_with_child_records(params, @time_entry)
|
|
|
rescue ActiveRecord::StaleObjectError
|
|
|
@conflict = true
|
|
|
if params[:last_journal_id]
|
|
|
@conflict_journals = @issue.journals_after(params[:last_journal_id]).all
|
|
|
@conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
if @saved
|
|
|
# 更新commit关联情况
|
|
|
update_issue_commit params[:commit_ids]
|
|
|
#修改界面增加跟踪者
|
|
|
watcherlist = @issue.watcher_users
|
|
|
select_users = []
|
|
|
if params[:issue]
|
|
|
if params[:issue][:watcher_user_ids]
|
|
|
params[:issue][:watcher_user_ids].each do |user_id|
|
|
|
select_users << User.find(user_id)
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
select_users.each do |user|
|
|
|
if watcherlist.include? user
|
|
|
else
|
|
|
@issue.add_watcher user
|
|
|
end
|
|
|
end
|
|
|
watcherlist.each do |user|
|
|
|
if select_users.include? user
|
|
|
else
|
|
|
@issue.remove_watcher user
|
|
|
end
|
|
|
end
|
|
|
|
|
|
render_attachment_warning_if_needed(@issue)
|
|
|
reply_id = params[:reference_user_id].to_i
|
|
|
if reply_id > 0
|
|
|
JournalReply.add_reply(@issue.current_journal.id, reply_id, User.current.id)
|
|
|
end
|
|
|
#flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record? 去掉这个notice，因为现在更新都是ajax操作
|
|
|
respond_to do |format|
|
|
|
format.js
|
|
|
format.html { redirect_to issue_url(@issue.id) }
|
|
|
format.api { render_api_ok }
|
|
|
end
|
|
|
else
|
|
|
respond_to do |format|
|
|
|
|
|
|
format.js
|
|
|
format.html { render :action => 'edit' }
|
|
|
format.api { render_validation_errors(@issue) }
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# 保存issue的时候相关的commit操作
|
|
|
# commit_ids => "9b9845ff,poor56el"
|
|
|
def update_issue_commit commit_ids
|
|
|
# 关联commmit
|
|
|
commit_ids = params[:commit_ids]
|
|
|
unless commit_ids.blank?
|
|
|
commit_ids = commit_ids.split(",").uniq
|
|
|
if params[:action] == "update"
|
|
|
exist_commit_ids = CommitIssues.where(:issue_id => @issue, :project_id => @issue.project_id)
|
|
|
unless exist_commit_ids.blank?
|
|
|
exist_commit_ids = exist_commit_ids.map{|commit| commit.commit_id}
|
|
|
commit_ids = commit_ids - exist_commit_ids
|
|
|
end
|
|
|
end
|
|
|
commit_ids.each do |commit_id|
|
|
|
CommitIssues.create(:commit_id => commit_id, :project_id => @issue.project_id, :issue_id => @issue.id)
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def update_user_issue_detail(issue, params)
|
|
|
case params[:type]
|
|
|
when "status"
|
|
|
issue.update_attribute(:status_id, params[:status_id])
|
|
|
when "assigned"
|
|
|
issue.update_attribute(:assigned_to_id, params[:assigned_to_id])
|
|
|
when "ratio"
|
|
|
issue.update_attribute(:done_ratio, params[:done_ratio])
|
|
|
when "prior"
|
|
|
issue.update_attribute(:priority_id, params[:priority_id])
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# Updates the issue form when changing the project, status or tracker
|
|
|
# on issue creation/update
|
|
|
def update_form
|
|
|
end
|
|
|
|
|
|
# Bulk edit/copy a set of issues
|
|
|
def bulk_edit
|
|
|
@issues.sort!
|
|
|
@copy = params[:copy].present?
|
|
|
@notes = params[:notes]
|
|
|
|
|
|
if User.current.allowed_to?(:move_issues, @projects)
|
|
|
@allowed_projects = Issue.allowed_target_projects_on_move
|
|
|
if params[:issue]
|
|
|
@target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
|
|
|
if @target_project
|
|
|
target_projects = [@target_project]
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
target_projects ||= @projects
|
|
|
|
|
|
if @copy
|
|
|
@available_statuses = [IssueStatus.default]
|
|
|
else
|
|
|
@available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
|
|
|
end
|
|
|
@custom_fields = target_projects.map{|p|p.all_issue_custom_fields}.reduce(:&)
|
|
|
@assignables = target_projects.map(&:assignable_users).reduce(:&)
|
|
|
@trackers = target_projects.map(&:trackers).reduce(:&)
|
|
|
@versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
|
|
|
@categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
|
|
|
if @copy
|
|
|
@attachments_present = @issues.detect {|i| i.attachments.any?}.present?
|
|
|
@subtasks_present = @issues.detect {|i| !i.leaf?}.present?
|
|
|
end
|
|
|
|
|
|
@safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
|
|
|
render :layout => false if request.xhr?
|
|
|
end
|
|
|
|
|
|
def bulk_update
|
|
|
@issues.sort!
|
|
|
@copy = params[:copy].present?
|
|
|
attributes = parse_params_for_bulk_issue_attributes(params)
|
|
|
|
|
|
unsaved_issue_ids = []
|
|
|
moved_issues = []
|
|
|
|
|
|
if @copy && params[:copy_subtasks].present?
|
|
|
# Descendant issues will be copied with the parent task
|
|
|
# Don't copy them twice
|
|
|
@issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
|
|
|
end
|
|
|
|
|
|
@issues.each do |issue|
|
|
|
issue.reload
|
|
|
if @copy
|
|
|
issue = issue.copy({},
|
|
|
:attachments => params[:copy_attachments].present?,
|
|
|
:subtasks => params[:copy_subtasks].present?
|
|
|
)
|
|
|
end
|
|
|
journal = issue.init_journal(User.current, params[:notes])
|
|
|
issue.safe_attributes = attributes
|
|
|
call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
|
|
|
if issue.save
|
|
|
moved_issues << issue
|
|
|
else
|
|
|
# Keep unsaved issue ids to display them in flash error
|
|
|
unsaved_issue_ids << issue.id
|
|
|
end
|
|
|
end
|
|
|
set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
|
|
|
|
|
|
if params[:follow]
|
|
|
if @issues.size == 1 && moved_issues.size == 1
|
|
|
redirect_to issue_url(moved_issues.first)
|
|
|
elsif moved_issues.map(&:project).uniq.size == 1
|
|
|
redirect_to project_issues_url(moved_issues.map(&:project).first)
|
|
|
end
|
|
|
else
|
|
|
redirect_back_or_default _project_issues_path(@project)
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def destroy
|
|
|
# 增加删除页面类型，如果是个人主页，则返回该主页，项目动态则返回项目动态页眉
|
|
|
page_classify = params[:page_classify] unless params[:page_classify].nil?
|
|
|
page_id = params[:page_id] unless params[:page_id].nil?
|
|
|
@hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
|
|
|
if @hours > 0
|
|
|
case params[:todo]
|
|
|
when 'destroy'
|
|
|
# nothing to do
|
|
|
when 'nullify'
|
|
|
TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
|
|
|
when 'reassign'
|
|
|
reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
|
|
|
if reassign_to.nil?
|
|
|
flash.now[:error] = l(:error_issue_not_found_in_project)
|
|
|
return
|
|
|
else
|
|
|
TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
|
|
|
end
|
|
|
else
|
|
|
# display the destroy form if it's a user request
|
|
|
return unless api_request?
|
|
|
end
|
|
|
end
|
|
|
@issues.each do |issue|
|
|
|
begin
|
|
|
issue.reload.destroy
|
|
|
rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
|
|
|
# nothing to do, issue was already deleted (eg. by a parent)
|
|
|
end
|
|
|
end
|
|
|
respond_to do |format|
|
|
|
if page_classify
|
|
|
format.html { redirect_back_or_default _project_issues_path(@project, page_classify, page_id) }
|
|
|
else
|
|
|
format.html { redirect_back_or_default _project_issues_path(@project) }
|
|
|
end
|
|
|
format.api { render_api_ok }
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def add_journal
|
|
|
if User.current.logged?
|
|
|
jour = Journal.new
|
|
|
jour.user_id = User.current.id
|
|
|
jour.notes = params[:notes]
|
|
|
jour.journalized = @issue
|
|
|
jour.save_attachments(params[:attachments])
|
|
|
jour.save
|
|
|
update_user_activity(@issue.class,@issue.id)
|
|
|
update_forge_activity(@issue.class,@issue.id)
|
|
|
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
|
|
@user_activity_id = params[:user_activity_id]
|
|
|
@priorities = IssuePriority.active
|
|
|
|
|
|
respond_to do |format|
|
|
|
# Issue详情单独处理
|
|
|
if params[:is_issue_show]
|
|
|
format.js{redirect_to issue_path(@issue)}
|
|
|
else
|
|
|
format.js
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def add_journal_in_org
|
|
|
if User.current.logged?
|
|
|
jour = Journal.new
|
|
|
jour.user_id = User.current.id
|
|
|
jour.notes = params[:notes]
|
|
|
jour.journalized = @issue
|
|
|
jour.save
|
|
|
org_activity = OrgActivity.where("org_act_type='Issue' and org_act_id =#{@issue.id}").first
|
|
|
org_activity.updated_at = jour.created_on
|
|
|
org_activity.save
|
|
|
@user_activity_id = params[:user_activity_id]
|
|
|
respond_to do |format|
|
|
|
format.js
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
#对某个journ回复,显示回复框
|
|
|
def reply
|
|
|
@issue = Issue.find(params[:id])
|
|
|
@jour = Journal.find(params[:journal_id])
|
|
|
respond_to do |format|
|
|
|
format.js
|
|
|
end
|
|
|
end
|
|
|
|
|
|
#给issue添加journ。回复内容包含 对某个被回复的journ的内容
|
|
|
def add_reply
|
|
|
if User.current.logged?
|
|
|
jour = Journal.find(params[:journal_id])
|
|
|
@issue = Issue.find params[:id]
|
|
|
@project = @issue.project
|
|
|
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
|
|
@priorities = IssuePriority.active
|
|
|
new_jour = Journal.new
|
|
|
new_jour.user_id = User.current.id
|
|
|
new_jour.reply_id = params[:journal_id]
|
|
|
new_jour.parent_id = jour.id
|
|
|
new_jour.notes = params[:content]
|
|
|
new_jour.journalized = @issue
|
|
|
new_jour.save_attachments(params[:attachments])
|
|
|
# new_jour = @issue.journals.build(:user_id => User.current.id, :reply_id => params[:journal_id], :notes => params[:content], :parent_id => jour.id)
|
|
|
@user_activity_id = params[:user_activity_id]
|
|
|
if new_jour.save
|
|
|
update_user_activity(@issue.class,@issue.id)
|
|
|
update_forge_activity(@issue.class,@issue.id)
|
|
|
respond_to do |format|
|
|
|
if params[:is_issue_show]
|
|
|
format.js{redirect_to issue_path(@issue)}
|
|
|
else
|
|
|
format.js
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# 需要刷新详情页面，代码同步一致
|
|
|
# 获取project和issue状态是为了刷新页面
|
|
|
# 值所以用delete是因为issue和journal在act_as_attachment中是同一个类型
|
|
|
# 非动态页面直接刷新，动态页面手动刷新
|
|
|
def delete_journal
|
|
|
@is_project = params[:is_project]
|
|
|
@issue = Issue.find(params[:id])
|
|
|
begin
|
|
|
forge_acts = ForgeMessage.where(:forge_message_type => "Journal", :forge_message_id => params[:journal_id])
|
|
|
forge_acts.destroy_all unless forge_acts.empty?
|
|
|
at_message = AtMessage.where(:at_message_type => "Journal", :at_message_id => params[:journal_id])
|
|
|
at_message.destroy_all unless at_message.empty?
|
|
|
Journal.delete(params[:journal_id])
|
|
|
rescue Exception => e
|
|
|
puts e
|
|
|
end
|
|
|
@user_activity_id = params[:user_activity_id]
|
|
|
respond_to do |format|
|
|
|
if @user_activity_id
|
|
|
format.js
|
|
|
else
|
|
|
format.js{ redirect_to issue_url(@issue)}
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def statistics
|
|
|
@project = Project.find(params[:id])
|
|
|
params[:author_id].to_i != 0 ? (@author = User.find(params[:author_id].to_i).show_name) : @author = 0
|
|
|
case params[:tracker_id].to_i
|
|
|
when 1
|
|
|
@tracker = "缺陷"
|
|
|
when 2
|
|
|
@tracker = "功能"
|
|
|
when 3
|
|
|
@tracker = "支持"
|
|
|
when 4
|
|
|
@tracker = "任务"
|
|
|
when 5
|
|
|
@tracker = "周报"
|
|
|
when 0
|
|
|
@tracker = 0
|
|
|
end
|
|
|
params[:subject].blank? ? @search = 0 : @search = params[:subject]
|
|
|
params[:assigned_to_id].to_i != 0 ? (@assigned = User.find(params[:assigned_to_id].to_i).show_name) : @assigned = 0
|
|
|
params[:fixed_version_id].to_i != 0 ? (@version = Version.find(params[:fixed_version_id].to_i).name) : @version = 0
|
|
|
params[:done_ratio].to_i != -1 ? (@done = params[:done_ratio].to_i) : @done = -1
|
|
|
case params[:priority_id].to_i
|
|
|
when 1
|
|
|
@prior = "低"
|
|
|
when 2
|
|
|
@prior = "正常"
|
|
|
when 3
|
|
|
@prior = "高"
|
|
|
when 4
|
|
|
@prior = "紧急"
|
|
|
when 5
|
|
|
@prior = "立刻"
|
|
|
when 0
|
|
|
@prior = 0
|
|
|
end
|
|
|
case params[:status_id].to_i
|
|
|
when 1
|
|
|
@status = "新增"
|
|
|
when 2
|
|
|
@status = "正在解决"
|
|
|
when 3
|
|
|
@status = "已解决"
|
|
|
when 4
|
|
|
@status = "反馈"
|
|
|
when 5
|
|
|
@status = "关闭"
|
|
|
when 6
|
|
|
@status = "拒绝"
|
|
|
when 0
|
|
|
@status = 0
|
|
|
end
|
|
|
params[:issue_create_date_start].blank? ? @start_time = 0 : @start_time = params[:issue_create_date_start]
|
|
|
params[:issue_create_date_end].blank? ? @end_time = 0 : @end_time = params[:issue_create_date_end]
|
|
|
@filter_condition = true
|
|
|
@filter_condition = false if (@author == 0 && @tracker == 0 && @search == 0 && @assigned == 0 && @version == 0 && @done == -1 && @prior ==0 && @status == 0 && @start_time ==0 && @end_time)
|
|
|
if @project.nil?
|
|
|
render_404
|
|
|
end
|
|
|
retrieve_query
|
|
|
sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
|
|
|
sort_update(@query.sortable_columns)
|
|
|
@query.sort_criteria = sort_criteria.to_a
|
|
|
@project_base_tag = 'base_projects'
|
|
|
if @query.valid?
|
|
|
@tracker_id = params[:tracker_id]
|
|
|
@assign_to_id = params[:assigned_to_id]
|
|
|
@author_id = params[:author_id]
|
|
|
@priority_id = params[:priority_id]
|
|
|
@status_id = params[:status_id]
|
|
|
@subject = params[:subject]
|
|
|
@done_ratio = params[:done_ratio]
|
|
|
@fixed_version_id = params[:fixed_version_id]
|
|
|
@issue_count = @query.issue_count
|
|
|
@test = params[:test]
|
|
|
@project_sort = 'issues.updated_on desc'
|
|
|
if params[:test] != "0"
|
|
|
case @test
|
|
|
when "1"
|
|
|
@project_sort = 'issues.created_on desc'
|
|
|
when "2"
|
|
|
@project_sort = 'issues.created_on asc'
|
|
|
when "3"
|
|
|
@project_sort = 'issues.updated_on desc'
|
|
|
when "4"
|
|
|
@project_sort = 'issues.updated_on asc'
|
|
|
end
|
|
|
end
|
|
|
# 搜索结果
|
|
|
# SELECT assigned_to_id, count(*) as ac FROM `issues` where project_id = @project.id group by assigned_to_id order by ac desc;
|
|
|
@issues_filter = @query.issues.sort_by{ |i| Issue.where(:project_id => @project.id , :assigned_to_id => i.assigned_to_id).count }.reverse
|
|
|
# @issues_filter = @query.issues(:order => @project_sort)
|
|
|
|
|
|
# if params[:type] == 1 || params[:type].nil?
|
|
|
# @results = @issues_filter
|
|
|
# elsif params[:type] == "2"
|
|
|
# @results = @issues_filter.collect{|result| result.status_id !=5 }
|
|
|
# elsif params[:type] == "3"
|
|
|
# @results = @issues_filter.collect{|result| result.status_id !=5 }
|
|
|
# end
|
|
|
|
|
|
#统计
|
|
|
@results = {}
|
|
|
|
|
|
#统计total
|
|
|
@alltotal = {}
|
|
|
for i in 0..5 do
|
|
|
@alltotal[i] = 0
|
|
|
end
|
|
|
|
|
|
@opentotal = {}
|
|
|
for i in 0..5 do
|
|
|
@opentotal[i] = 0
|
|
|
end
|
|
|
|
|
|
@closetotal = {}
|
|
|
for i in 0..5 do
|
|
|
@closetotal[i] = 0
|
|
|
end
|
|
|
|
|
|
#开启关闭
|
|
|
@issue_open_count = 0
|
|
|
@issue_close_count = 0
|
|
|
|
|
|
@issues_filter.each do |issue|
|
|
|
@alltotal[0] = @alltotal[0] + 1
|
|
|
@alltotal[issue.tracker_id.to_i] = @alltotal[issue.tracker_id.to_i] + 1
|
|
|
user_id = issue.assigned_to_id
|
|
|
if issue.assigned_to_id.nil?
|
|
|
user_id = 0
|
|
|
end
|
|
|
|
|
|
if !@results[user_id].nil?
|
|
|
@results[user_id][0] = @results[user_id][0] + 1
|
|
|
@results[user_id][issue.tracker_id.to_i] = @results[user_id][issue.tracker_id.to_i] + 1
|
|
|
|
|
|
if issue.status_id.to_i == 5
|
|
|
@issue_close_count = @issue_close_count + 1
|
|
|
@results[user_id][12] = @results[user_id][12]+1
|
|
|
@results[user_id][12+issue.tracker_id.to_i] = @results[user_id][12+issue.tracker_id.to_i]+1
|
|
|
|
|
|
@closetotal[0] = @closetotal[0] + 1
|
|
|
@closetotal[issue.tracker_id.to_i] = @closetotal[issue.tracker_id.to_i] + 1
|
|
|
else
|
|
|
@issue_open_count = @issue_open_count + 1
|
|
|
@results[user_id][6] = @results[user_id][6]+1
|
|
|
@results[user_id][6+issue.tracker_id.to_i] = @results[user_id][6+issue.tracker_id.to_i]+1
|
|
|
|
|
|
@opentotal[0] = @opentotal[0] + 1
|
|
|
@opentotal[issue.tracker_id.to_i] = @opentotal[issue.tracker_id.to_i] + 1
|
|
|
end
|
|
|
else
|
|
|
|
|
|
@results[user_id] = {}
|
|
|
|
|
|
tmpuser = User.find(user_id)
|
|
|
|
|
|
@results[user_id][:name] = tmpuser.nil? ? "" : tmpuser.show_name
|
|
|
#所有的
|
|
|
@results[user_id][0] = 1
|
|
|
for i in 1..17 do
|
|
|
@results[user_id][i] = 0
|
|
|
end
|
|
|
# @results[user_id][1] = 0
|
|
|
# @results[user_id][2] = 0
|
|
|
# @results[user_id][3] = 0
|
|
|
# @results[user_id][4] = 0
|
|
|
# @results[user_id][5] = 0
|
|
|
@results[user_id][issue.tracker_id.to_i] = 1
|
|
|
|
|
|
#开启的 status_id = 12346
|
|
|
# @results[user_id][6] = 0
|
|
|
# @results[user_id][7] = 0
|
|
|
# @results[user_id][8] = 0
|
|
|
# @results[user_id][9] = 0
|
|
|
# @results[user_id][10] = 0
|
|
|
# @results[user_id][11] = 0
|
|
|
|
|
|
#关闭的 status_id = 5
|
|
|
# @results[user_id][12] = 0
|
|
|
# @results[user_id][13] = 0
|
|
|
# @results[user_id][14] = 0
|
|
|
# @results[user_id][15] = 0
|
|
|
# @results[user_id][16] = 0
|
|
|
# @results[user_id][17] = 0
|
|
|
|
|
|
if issue.status_id.to_i == 5
|
|
|
@results[user_id][12] = 1
|
|
|
@results[user_id][12+issue.tracker_id.to_i] = 1
|
|
|
@issue_close_count = @issue_close_count+1
|
|
|
|
|
|
@closetotal[0] = @closetotal[0] + 1
|
|
|
@closetotal[issue.tracker_id.to_i] = @closetotal[issue.tracker_id.to_i] + 1
|
|
|
else
|
|
|
@issue_open_count = @issue_open_count+1
|
|
|
@results[user_id][6] = 1
|
|
|
@results[user_id][6+issue.tracker_id.to_i] = 1
|
|
|
|
|
|
@opentotal[0] = @opentotal[0] + 1
|
|
|
@opentotal[issue.tracker_id.to_i] = @opentotal[issue.tracker_id.to_i] + 1
|
|
|
end
|
|
|
|
|
|
end
|
|
|
end
|
|
|
|
|
|
respond_to do |format|
|
|
|
format.js
|
|
|
end
|
|
|
|
|
|
else
|
|
|
render_404
|
|
|
end
|
|
|
end
|
|
|
|
|
|
private
|
|
|
|
|
|
def find_project
|
|
|
project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
|
|
|
@project = Project.find(project_id)
|
|
|
rescue ActiveRecord::RecordNotFound
|
|
|
render_404
|
|
|
end
|
|
|
|
|
|
def retrieve_previous_and_next_issue_ids
|
|
|
retrieve_query_from_session
|
|
|
if @query
|
|
|
sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
|
|
|
sort_update(@query.sortable_columns, 'issues_index_sort')
|
|
|
limit = 500
|
|
|
issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
|
|
|
if (idx = issue_ids.index(@issue.id)) && idx < limit
|
|
|
if issue_ids.size < 500
|
|
|
@issue_position = idx + 1
|
|
|
@issue_count = issue_ids.size
|
|
|
end
|
|
|
@prev_issue_id = issue_ids[idx - 1] if idx > 0
|
|
|
@next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
|
|
|
# Used by #edit and #update to set some common instance variables
|
|
|
# from the params
|
|
|
# TODO: Refactor, not everything in here is needed by #edit
|
|
|
def update_issue_from_params
|
|
|
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
|
|
|
@time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
|
|
|
@time_entry.attributes = params[:time_entry]
|
|
|
|
|
|
# 更新issue状态时，journal表产生记录，返回@current_journal
|
|
|
@issue.init_journal(User.current)
|
|
|
issue_attributes = params[:issue]
|
|
|
if issue_attributes && params[:conflict_resolution]
|
|
|
case params[:conflict_resolution]
|
|
|
when 'overwrite'
|
|
|
issue_attributes = issue_attributes.dup
|
|
|
issue_attributes.delete(:lock_version)
|
|
|
when 'add_notes'
|
|
|
issue_attributes = issue_attributes.slice(:notes)
|
|
|
when 'cancel'
|
|
|
redirect_to issue_url(@issue)
|
|
|
return false
|
|
|
end
|
|
|
end
|
|
|
|
|
|
if params[:action] == "update"
|
|
|
senduser = User.find(params[:issue][:assigned_to_id])
|
|
|
if senduser.id != User.current.id && @issue.assigned_to_id != params[:issue][:assigned_to_id].to_i
|
|
|
issue_id = @issue.id
|
|
|
issue_title = params[:issue][:subject]
|
|
|
priority_id = params[:issue][:priority_id]
|
|
|
ps = ProjectsService.new
|
|
|
ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
|
|
|
end
|
|
|
end
|
|
|
|
|
|
@issue.safe_attributes = issue_attributes
|
|
|
@priorities = IssuePriority.active
|
|
|
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
|
|
true
|
|
|
end
|
|
|
|
|
|
# TODO: Refactor, lots of extra code in here
|
|
|
# TODO: Changing tracker on an existing issue should not trigger this
|
|
|
def build_new_issue_from_params
|
|
|
if params[:id].blank?
|
|
|
@issue = Issue.new
|
|
|
if params[:copy_from]
|
|
|
begin
|
|
|
@copy_from = Issue.visible.find(params[:copy_from])
|
|
|
@copy_attachments = params[:copy_attachments].present? || request.get?
|
|
|
@copy_subtasks = params[:copy_subtasks].present? || request.get?
|
|
|
@issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks)
|
|
|
rescue ActiveRecord::RecordNotFound
|
|
|
render_404
|
|
|
return
|
|
|
end
|
|
|
end
|
|
|
@issue.project = @project
|
|
|
else
|
|
|
@issue = @project.issues.visible.find(params[:id])
|
|
|
end
|
|
|
|
|
|
@issue.project = @project
|
|
|
@issue.author ||= User.current
|
|
|
# Tracker must be set before custom field values
|
|
|
@issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
|
|
|
if @issue.tracker.nil?
|
|
|
render_error l(:error_no_tracker_in_project)
|
|
|
return false
|
|
|
end
|
|
|
@issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
|
|
|
@issue.safe_attributes = params[:issue]
|
|
|
|
|
|
@priorities = IssuePriority.active
|
|
|
@allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
|
|
|
@available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
|
|
|
end
|
|
|
|
|
|
def check_for_default_issue_status
|
|
|
if IssueStatus.default.nil?
|
|
|
render_error l(:error_no_default_issue_status)
|
|
|
return false
|
|
|
end
|
|
|
end
|
|
|
|
|
|
def parse_params_for_bulk_issue_attributes(params)
|
|
|
attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
|
|
|
attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
|
|
|
if custom = attributes[:custom_field_values]
|
|
|
custom.reject! {|k,v| v.blank?}
|
|
|
custom.keys.each do |k|
|
|
|
if custom[k].is_a?(Array)
|
|
|
custom[k] << '' if custom[k].delete('__none__')
|
|
|
else
|
|
|
custom[k] = '' if custom[k] == '__none__'
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
attributes
|
|
|
end
|
|
|
end
|
