168 lines
6.5 KiB
Ruby
168 lines
6.5 KiB
Ruby
# -*- encoding : utf-8 -*-
|
|
class Projects::PullRequestsController < Projects::BaseController
|
|
before_filter :authenticate_user!
|
|
skip_before_filter :authenticate_user!, :only => [:index, :show] if APP_CONFIG['anonymous_access']
|
|
load_and_authorize_resource :project
|
|
|
|
load_resource :issue, :through => :project, :find_by => :serial_id, :parent => false, :except => [:index, :autocomplete_to_project]
|
|
load_and_authorize_resource :instance_name => :pull, :through => :issue, :singleton => true, :except => [:index, :autocomplete_to_project]
|
|
before_filter :find_collaborators, :only => [:new, :create, :show]
|
|
|
|
def new
|
|
to_project = find_destination_project(false)
|
|
authorize! :read, to_project
|
|
|
|
@pull = to_project.pull_requests.new
|
|
@pull.issue = to_project.issues.new
|
|
set_attrs
|
|
|
|
if PullRequest.check_ref(@pull, 'to', @pull.to_ref) && PullRequest.check_ref(@pull, 'from', @pull.from_ref) || @pull.uniq_merge
|
|
flash.now[:warning] = @pull.errors.full_messages.join('. ')
|
|
else
|
|
@pull.check(false) # don't make event transaction
|
|
if @pull.already?
|
|
@pull.destroy
|
|
flash.now[:warning] = I18n.t('projects.pull_requests.up_to_date', :to_ref => @pull.to_ref, :from_ref => @pull.from_ref)
|
|
else
|
|
load_diff_commits_data
|
|
end
|
|
end
|
|
end
|
|
|
|
def create
|
|
unless pull_params
|
|
raise 'expect pull_request params' # for debug
|
|
redirect :back
|
|
end
|
|
to_project = find_destination_project
|
|
authorize! :read, to_project
|
|
|
|
@pull = to_project.pull_requests.new pull_params
|
|
@pull.issue.assignee_id = (params[:issue] || {})[:assignee_id] if can?(:write, to_project)
|
|
@pull.issue.user, @pull.issue.project, @pull.from_project = current_user, to_project, @project
|
|
@pull.from_project_owner_uname = @pull.from_project.owner.uname
|
|
@pull.from_project_name = @pull.from_project.name
|
|
|
|
if @pull.valid? # FIXME more clean/clever logics
|
|
@pull.save # set pull id
|
|
@pull.check(false) # don't make event transaction
|
|
if @pull.already?
|
|
@pull.destroy
|
|
flash.now[:error] = I18n.t('projects.pull_requests.up_to_date', :to_ref => @pull.to_ref, :from_ref => @pull.from_ref)
|
|
render :new
|
|
else
|
|
@pull.send(@pull.status == 'blocked' ? 'block' : @pull.status)
|
|
redirect_to project_pull_request_path(@pull.to_project, @pull)
|
|
end
|
|
else
|
|
flash.now[:error] = t('flash.pull_request.save_error')
|
|
flash.now[:warning] = @pull.errors.full_messages.join('. ')
|
|
|
|
if @pull.errors.try(:messages) && @pull.errors.messages[:to_ref].nil? && @pull.errors.messages[:from_ref].nil?
|
|
@pull.check(false) # don't make event transaction
|
|
load_diff_commits_data
|
|
end
|
|
render :new
|
|
end
|
|
end
|
|
|
|
def update
|
|
if (action = params[:pull_request_action]) && %w(close reopen).include?(params[:pull_request_action])
|
|
if @pull.send("can_#{action}?")
|
|
@pull.set_user_and_time current_user
|
|
@pull.send(action)
|
|
@pull.check if @pull.open?
|
|
end
|
|
end
|
|
redirect_to project_pull_request_path(@pull.to_project, @pull)
|
|
end
|
|
|
|
def merge
|
|
unless @pull.merge!(current_user)
|
|
flash.now[:error] = t('flash.pull_request.save_error')
|
|
flash.now[:warning] = @pull.errors.full_messages.join('. ')
|
|
end
|
|
redirect_to project_pull_request_path(@pull.to_project, @pull)
|
|
end
|
|
|
|
def show
|
|
load_diff_commits_data
|
|
end
|
|
|
|
def index(status = 200)
|
|
@issues_with_pull_request = @project.issues.joins(:pull_request)
|
|
@issues_with_pull_request = @issues_with_pull_request.where(:assignee_id => current_user.id) if @is_assigned_to_me = params[:filter] == 'to_me'
|
|
@issues_with_pull_request = @issues_with_pull_request.search(params[:search_pull_request]) if params[:search_pull_request] !~ /#{t('layout.pull_requests.search')}/
|
|
|
|
@opened_issues, @closed_issues = @issues_with_pull_request.not_closed_or_merged.count, @issues_with_pull_request.closed_or_merged.count
|
|
|
|
@status = params[:status] == 'closed' ? :closed : :open
|
|
@issues_with_pull_request = @issues_with_pull_request.send( (@status == :closed) ? :closed_or_merged : :not_closed_or_merged )
|
|
|
|
@sort = params[:sort] == 'updated' ? :updated : :created
|
|
@direction = params[:direction] == 'asc' ? :asc : :desc
|
|
@issues_with_pull_request = @issues_with_pull_request.order("issues.#{@sort}_at #{@direction}")
|
|
|
|
@issues_with_pull_request = @issues_with_pull_request.
|
|
includes(:assignee, :user, :pull_request).uniq.
|
|
paginate :per_page => 20, :page => params[:page]
|
|
if status == 200
|
|
render 'index', :layout => request.xhr? ? 'with_sidebar' : 'application'
|
|
else
|
|
render :status => status, :nothing => true
|
|
end
|
|
end
|
|
|
|
def autocomplete_to_project
|
|
items = []
|
|
term = params[:term].to_s.strip.downcase
|
|
[Project.accessible_by(current_ability, :membered), @project.ancestors].each do |p|
|
|
items.concat p.by_owner_and_name(term)
|
|
end
|
|
items = items.uniq{|i| i.id}.select{|e| e.repo.branches.count > 0}
|
|
render :json => json_for_autocomplete_base(items)
|
|
end
|
|
|
|
protected
|
|
|
|
def pull_params
|
|
@pull_params ||= params[:pull_request].presence
|
|
end
|
|
|
|
def json_for_autocomplete_base items
|
|
items.collect do |project|
|
|
hash = {:id => project.id.to_s, :label => project.name_with_owner, :value => project.name_with_owner}
|
|
hash[:get_refs_url] = project_refs_list_path(project)
|
|
hash
|
|
end
|
|
end
|
|
|
|
def load_diff_commits_data
|
|
@commits = @pull.repo.commits_between(@pull.to_commit, @pull.from_commit)
|
|
@total_commits = @commits.count
|
|
@commits = @commits.last(100)
|
|
|
|
@stats = @pull.diff_stats
|
|
@comments, @commentable = @issue.comments, @issue
|
|
end
|
|
|
|
def find_destination_project bang=true
|
|
args = params[:to_project].try(:split, '/') || []
|
|
project = (args.length == 2) ? Project.find_by_owner_and_name(*args) : nil
|
|
raise ActiveRecord::RecordNotFound if bang && !project
|
|
project || @project
|
|
end
|
|
|
|
def set_attrs
|
|
if pull_params && pull_params[:issue_attributes]
|
|
@pull.issue.title = pull_params[:issue_attributes][:title].presence
|
|
@pull.issue.body = pull_params[:issue_attributes][:body].presence
|
|
end
|
|
@pull.from_project = @project
|
|
@pull.to_ref = (pull_params[:to_ref].presence if pull_params) || @pull.to_project.default_head
|
|
@pull.from_ref = params[:treeish].presence || (pull_params[:from_ref].presence if pull_params) || @pull.from_project.default_head(params[:treeish])
|
|
@pull.from_project_owner_uname = @pull.from_project.owner.uname
|
|
@pull.from_project_name = @pull.from_project.name
|
|
end
|
|
end
|