2013-06-23 16:47:22 +00:00
|
|
|
class Projects::IssuesController < Projects::ApplicationController
|
2017-03-31 03:06:09 +00:00
|
|
|
include RendersNotes
|
2016-03-15 16:18:47 +00:00
|
|
|
include ToggleSubscriptionAction
|
2016-03-21 13:12:52 +00:00
|
|
|
include IssuableActions
|
2016-04-16 19:09:08 +00:00
|
|
|
include ToggleAwardEmoji
|
2016-07-23 23:28:12 +00:00
|
|
|
include IssuableCollections
|
2016-08-02 21:21:57 +00:00
|
|
|
include SpammableActions
|
2016-03-15 16:18:47 +00:00
|
|
|
|
2017-03-06 20:18:39 +00:00
|
|
|
prepend_before_action :authenticate_user!, only: [:new]
|
|
|
|
|
2017-06-20 11:13:04 +00:00
|
|
|
before_action :check_issues_available!
|
2017-06-12 16:19:39 +00:00
|
|
|
before_action :issue, except: [:index, :new, :create, :bulk_update]
|
2011-12-15 21:57:46 +00:00
|
|
|
|
|
|
|
# Allow write(create) issue
|
2015-06-26 14:44:21 +00:00
|
|
|
before_action :authorize_create_issue!, only: [:new, :create]
|
2011-12-15 21:57:46 +00:00
|
|
|
|
|
|
|
# Allow modify issue
|
2015-06-26 14:44:21 +00:00
|
|
|
before_action :authorize_update_issue!, only: [:edit, :update]
|
2014-02-10 13:36:58 +00:00
|
|
|
|
2017-05-04 08:09:21 +00:00
|
|
|
# Allow create a new branch and empty WIP merge request from current issue
|
|
|
|
before_action :authorize_create_merge_request!, only: [:create_merge_request]
|
|
|
|
|
2013-11-29 13:05:32 +00:00
|
|
|
respond_to :html
|
2011-10-08 21:36:38 +00:00
|
|
|
|
|
|
|
def index
|
2017-01-23 20:40:25 +00:00
|
|
|
@collection_type = "Issue"
|
|
|
|
@issues = issues_collection
|
|
|
|
@issues = @issues.page(params[:page])
|
2017-02-16 20:03:42 +00:00
|
|
|
@issuable_meta_data = issuable_meta_data(@issues, @collection_type)
|
2017-01-23 20:40:25 +00:00
|
|
|
|
2016-12-20 18:52:09 +00:00
|
|
|
if @issues.out_of_range? && @issues.total_pages != 0
|
2017-04-05 22:52:19 +00:00
|
|
|
return redirect_to url_for(params.merge(page: @issues.total_pages, only_path: true))
|
2016-12-20 18:52:09 +00:00
|
|
|
end
|
2016-09-19 20:34:27 +00:00
|
|
|
|
2016-10-13 20:14:05 +00:00
|
|
|
if params[:label_name].present?
|
2016-09-19 20:34:27 +00:00
|
|
|
@labels = LabelsFinder.new(current_user, project_id: @project.id, title: params[:label_name]).execute
|
|
|
|
end
|
2011-11-15 09:09:07 +00:00
|
|
|
|
2017-01-20 21:35:39 +00:00
|
|
|
@users = []
|
|
|
|
|
|
|
|
if params[:assignee_id].present?
|
|
|
|
assignee = User.find_by_id(params[:assignee_id])
|
|
|
|
@users.push(assignee) if assignee
|
|
|
|
end
|
|
|
|
|
|
|
|
if params[:author_id].present?
|
|
|
|
author = User.find_by_id(params[:author_id])
|
|
|
|
@users.push(author) if author
|
|
|
|
end
|
|
|
|
|
2011-10-08 21:36:38 +00:00
|
|
|
respond_to do |format|
|
2013-11-29 13:05:32 +00:00
|
|
|
format.html
|
2017-06-12 17:21:13 +00:00
|
|
|
format.atom { render layout: 'xml.atom' }
|
2013-11-29 13:05:32 +00:00
|
|
|
format.json do
|
|
|
|
render json: {
|
2016-04-09 04:09:09 +00:00
|
|
|
html: view_to_html_string("projects/issues/_issues"),
|
2016-04-20 16:00:12 +00:00
|
|
|
labels: @labels.as_json(methods: :text_color)
|
2013-11-29 13:05:32 +00:00
|
|
|
}
|
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def new
|
2014-07-01 12:03:49 +00:00
|
|
|
params[:issue] ||= ActionController::Parameters.new(
|
2017-05-04 12:11:15 +00:00
|
|
|
assignee_ids: ""
|
2014-07-01 12:03:49 +00:00
|
|
|
)
|
2016-12-22 12:31:12 +00:00
|
|
|
build_params = issue_params.merge(
|
2017-03-10 08:19:12 +00:00
|
|
|
merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of],
|
2017-02-27 09:23:36 +00:00
|
|
|
discussion_to_resolve: params[:discussion_to_resolve]
|
2016-12-22 12:31:12 +00:00
|
|
|
)
|
2017-02-27 09:23:36 +00:00
|
|
|
service = Issues::BuildService.new(project, current_user, build_params)
|
2016-12-22 12:31:12 +00:00
|
|
|
|
2017-02-27 09:23:36 +00:00
|
|
|
@issue = @noteable = service.execute
|
2017-03-10 08:19:12 +00:00
|
|
|
@merge_request_to_resolve_discussions_of = service.merge_request_to_resolve_discussions_of
|
2017-02-27 17:12:52 +00:00
|
|
|
@discussion_to_resolve = service.discussions_to_resolve.first if params[:discussion_to_resolve]
|
2014-07-01 12:03:49 +00:00
|
|
|
|
2011-10-08 21:36:38 +00:00
|
|
|
respond_with(@issue)
|
|
|
|
end
|
|
|
|
|
|
|
|
def edit
|
|
|
|
respond_with(@issue)
|
|
|
|
end
|
|
|
|
|
|
|
|
def show
|
2013-12-25 20:32:48 +00:00
|
|
|
@noteable = @issue
|
2017-03-10 01:29:11 +00:00
|
|
|
@note = @project.notes.new(noteable: @issue)
|
2011-11-04 15:46:51 +00:00
|
|
|
|
2017-03-10 01:29:11 +00:00
|
|
|
@discussions = @issue.discussions
|
|
|
|
@notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
|
2016-07-20 04:52:31 +00:00
|
|
|
|
2016-03-13 19:08:42 +00:00
|
|
|
respond_to do |format|
|
|
|
|
format.html
|
|
|
|
format.json do
|
2016-11-19 02:19:04 +00:00
|
|
|
render json: IssueSerializer.new.represent(@issue)
|
2016-03-13 19:08:42 +00:00
|
|
|
end
|
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def create
|
2017-02-27 09:23:36 +00:00
|
|
|
create_params = issue_params.merge(spammable_params).merge(
|
2017-03-10 08:19:12 +00:00
|
|
|
merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of],
|
2017-02-27 09:23:36 +00:00
|
|
|
discussion_to_resolve: params[:discussion_to_resolve]
|
|
|
|
)
|
|
|
|
|
2017-03-08 19:16:17 +00:00
|
|
|
service = Issues::CreateService.new(project, current_user, create_params)
|
|
|
|
@issue = service.execute
|
|
|
|
|
2017-03-09 13:25:54 +00:00
|
|
|
if service.discussions_to_resolve.count(&:resolved?) > 0
|
2017-03-10 12:36:50 +00:00
|
|
|
flash[:notice] = if service.discussion_to_resolve_id
|
2017-03-09 13:25:54 +00:00
|
|
|
"Resolved 1 discussion."
|
|
|
|
else
|
|
|
|
"Resolved all discussions."
|
|
|
|
end
|
2017-03-08 19:16:17 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
|
2012-02-29 20:38:24 +00:00
|
|
|
respond_to do |format|
|
2012-08-30 17:00:16 +00:00
|
|
|
format.html do
|
2017-02-14 19:07:11 +00:00
|
|
|
recaptcha_check_with_fallback { render :new }
|
2012-08-30 17:00:16 +00:00
|
|
|
end
|
2016-07-16 16:42:44 +00:00
|
|
|
format.js do
|
2014-05-23 08:22:00 +00:00
|
|
|
@link = @issue.attachment.url.to_js
|
|
|
|
end
|
2012-02-29 20:38:24 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def update
|
2017-02-14 19:07:11 +00:00
|
|
|
update_params = issue_params.merge(spammable_params)
|
|
|
|
|
|
|
|
@issue = Issues::UpdateService.new(project, current_user, update_params).execute(issue)
|
2011-10-08 21:36:38 +00:00
|
|
|
|
2016-03-18 13:48:55 +00:00
|
|
|
if params[:move_to_project_id].to_i > 0
|
|
|
|
new_project = Project.find(params[:move_to_project_id])
|
2016-04-30 19:14:40 +00:00
|
|
|
return render_404 unless issue.can_move?(current_user, new_project)
|
|
|
|
|
2016-03-20 08:28:06 +00:00
|
|
|
move_service = Issues::MoveService.new(project, current_user)
|
2016-03-18 13:48:55 +00:00
|
|
|
@issue = move_service.execute(@issue, new_project)
|
2016-02-17 14:59:25 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
|
|
|
|
respond_to do |format|
|
2012-10-09 19:09:46 +00:00
|
|
|
format.html do
|
2017-02-14 19:07:11 +00:00
|
|
|
recaptcha_check_with_fallback { render :edit }
|
2012-03-25 16:05:24 +00:00
|
|
|
end
|
2016-05-25 23:08:48 +00:00
|
|
|
|
2014-06-04 15:52:35 +00:00
|
|
|
format.json do
|
2017-03-21 02:36:53 +00:00
|
|
|
if @issue.valid?
|
2017-05-17 12:01:24 +00:00
|
|
|
render json: IssueSerializer.new.represent(@issue)
|
2017-03-21 02:36:53 +00:00
|
|
|
else
|
|
|
|
render json: { errors: @issue.errors.full_messages }, status: :unprocessable_entity
|
|
|
|
end
|
2014-06-04 15:52:35 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
2016-08-01 15:34:17 +00:00
|
|
|
|
|
|
|
rescue ActiveRecord::StaleObjectError
|
2017-01-16 18:43:03 +00:00
|
|
|
render_conflict_response
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
2016-04-12 13:55:54 +00:00
|
|
|
def referenced_merge_requests
|
|
|
|
@merge_requests = @issue.referenced_merge_requests(current_user)
|
|
|
|
@closed_by_merge_requests = @issue.closed_by_merge_requests(current_user)
|
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.json do
|
|
|
|
render json: {
|
|
|
|
html: view_to_html_string('projects/issues/_merge_requests')
|
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def related_branches
|
2016-04-15 04:20:53 +00:00
|
|
|
@related_branches = @issue.related_branches(current_user)
|
2016-04-12 13:55:54 +00:00
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.json do
|
|
|
|
render json: {
|
|
|
|
html: view_to_html_string('projects/issues/_related_branches')
|
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-21 14:34:00 +00:00
|
|
|
def can_create_branch
|
|
|
|
can_create = current_user &&
|
|
|
|
can?(current_user, :push_code, @project) &&
|
|
|
|
@issue.can_be_worked_on?(current_user)
|
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.json do
|
2017-05-04 08:09:21 +00:00
|
|
|
render json: { can_create_branch: can_create, has_related_branch: @issue.has_related_branch? }
|
2016-04-21 14:34:00 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-05-13 20:19:49 +00:00
|
|
|
def realtime_changes
|
2017-04-06 01:13:06 +00:00
|
|
|
Gitlab::PollingInterval.set_header(response, interval: 3_000)
|
2017-04-26 23:31:09 +00:00
|
|
|
|
2017-05-18 12:24:34 +00:00
|
|
|
response = {
|
2017-04-21 20:34:11 +00:00
|
|
|
title: view_context.markdown_field(@issue, :title),
|
2017-05-01 21:45:50 +00:00
|
|
|
title_text: @issue.title,
|
2017-04-21 20:34:11 +00:00
|
|
|
description: view_context.markdown_field(@issue, :description),
|
|
|
|
description_text: @issue.description,
|
2017-05-18 12:24:34 +00:00
|
|
|
task_status: @issue.task_status
|
2017-04-21 20:34:11 +00:00
|
|
|
}
|
2017-05-18 12:24:34 +00:00
|
|
|
|
2017-08-24 16:26:24 +00:00
|
|
|
if @issue.edited?
|
2017-05-18 12:24:34 +00:00
|
|
|
response[:updated_at] = @issue.updated_at
|
|
|
|
response[:updated_by_name] = @issue.last_edited_by.name
|
|
|
|
response[:updated_by_path] = user_path(@issue.last_edited_by)
|
|
|
|
end
|
|
|
|
|
|
|
|
render json: response
|
2017-04-06 01:13:06 +00:00
|
|
|
end
|
|
|
|
|
2017-05-04 08:09:21 +00:00
|
|
|
def create_merge_request
|
2017-08-10 14:19:55 +00:00
|
|
|
result = ::MergeRequests::CreateFromIssueService.new(project, current_user, issue_iid: issue.iid).execute
|
2017-05-04 08:09:21 +00:00
|
|
|
|
|
|
|
if result[:status] == :success
|
|
|
|
render json: MergeRequestCreateSerializer.new.represent(result[:merge_request])
|
|
|
|
else
|
|
|
|
render json: result[:messsage], status: :unprocessable_entity
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2011-10-26 13:46:25 +00:00
|
|
|
protected
|
2011-10-17 10:39:03 +00:00
|
|
|
|
|
|
|
def issue
|
2017-06-12 16:19:39 +00:00
|
|
|
return @issue if defined?(@issue)
|
2016-10-06 19:09:55 +00:00
|
|
|
# The Sortable default scope causes performance issues when used with find_by
|
2017-07-14 11:38:06 +00:00
|
|
|
@noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take!
|
2017-06-12 16:19:39 +00:00
|
|
|
|
|
|
|
return render_404 unless can?(current_user, :read_issue, @issue)
|
|
|
|
|
|
|
|
@issue
|
2011-10-17 10:39:03 +00:00
|
|
|
end
|
2016-03-15 16:18:47 +00:00
|
|
|
alias_method :subscribable_resource, :issue
|
2016-03-21 13:12:52 +00:00
|
|
|
alias_method :issuable, :issue
|
2016-04-16 19:09:08 +00:00
|
|
|
alias_method :awardable, :issue
|
2016-08-02 21:21:57 +00:00
|
|
|
alias_method :spammable, :issue
|
2011-12-15 21:57:46 +00:00
|
|
|
|
2017-06-29 17:06:35 +00:00
|
|
|
def spammable_path
|
|
|
|
project_issue_path(@project, @issue)
|
|
|
|
end
|
|
|
|
|
2015-06-26 14:44:21 +00:00
|
|
|
def authorize_update_issue!
|
2017-06-13 08:25:25 +00:00
|
|
|
render_404 unless can?(current_user, :update_issue, @issue)
|
2011-12-15 21:57:46 +00:00
|
|
|
end
|
|
|
|
|
2014-02-10 13:36:58 +00:00
|
|
|
def authorize_admin_issues!
|
2017-06-13 08:25:25 +00:00
|
|
|
render_404 unless can?(current_user, :admin_issue, @project)
|
2011-12-15 21:57:46 +00:00
|
|
|
end
|
2012-02-06 17:40:32 +00:00
|
|
|
|
2017-05-04 08:09:21 +00:00
|
|
|
def authorize_create_merge_request!
|
2017-06-13 08:25:25 +00:00
|
|
|
render_404 unless can?(current_user, :push_code, @project) && @issue.can_be_worked_on?(current_user)
|
2017-05-04 08:09:21 +00:00
|
|
|
end
|
|
|
|
|
2017-06-20 11:13:04 +00:00
|
|
|
def check_issues_available!
|
2017-06-13 08:25:25 +00:00
|
|
|
return render_404 unless @project.feature_available?(:issues, current_user)
|
2012-02-06 17:40:32 +00:00
|
|
|
end
|
2012-06-12 08:31:38 +00:00
|
|
|
|
2014-06-26 11:30:07 +00:00
|
|
|
def issue_params
|
2017-06-29 10:43:47 +00:00
|
|
|
params.require(:issue).permit(*issue_params_attributes)
|
|
|
|
end
|
|
|
|
|
|
|
|
def issue_params_attributes
|
|
|
|
%i[
|
|
|
|
title
|
|
|
|
assignee_id
|
|
|
|
position
|
|
|
|
description
|
|
|
|
confidential
|
|
|
|
milestone_id
|
|
|
|
due_date
|
|
|
|
state_event
|
|
|
|
task_num
|
|
|
|
lock_version
|
|
|
|
] + [{ label_ids: [], assignee_ids: [] }]
|
2014-06-26 11:30:07 +00:00
|
|
|
end
|
2017-03-23 17:43:47 +00:00
|
|
|
|
|
|
|
def authenticate_user!
|
|
|
|
return if current_user
|
|
|
|
|
|
|
|
notice = "Please sign in to create the new issue."
|
|
|
|
|
2017-05-19 18:35:08 +00:00
|
|
|
if request.get? && !request.xhr?
|
|
|
|
store_location_for :user, request.fullpath
|
|
|
|
end
|
|
|
|
|
2017-03-23 17:43:47 +00:00
|
|
|
redirect_to new_user_session_path, notice: notice
|
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|