rosa-build/app/controllers/projects/pull_requests_controller.rb

156 lines
5.6 KiB
Ruby
Raw Normal View History

# -*- encoding : utf-8 -*-
2012-05-04 11:56:11 +01:00
class Projects::PullRequestsController < Projects::BaseController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => [:index, :show] if APP_CONFIG['anonymous_access']
2012-09-26 18:10:04 +01:00
load_and_authorize_resource :project
2012-10-03 12:36:04 +01:00
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]
def new
to_project = find_destination_project(false)
2012-10-03 12:36:04 +01:00
authorize! :read, to_project
2012-07-06 18:30:01 +01:00
2012-10-03 12:36:04 +01:00
@pull = to_project.pull_requests.new
@pull.issue = to_project.issues.new
2012-08-07 17:34:22 +01:00
set_attrs
2012-07-06 18:30:01 +01:00
if PullRequest.check_ref(@pull, 'to', @pull.to_ref) && PullRequest.check_ref(@pull, 'from', @pull.from_ref) || @pull.uniq_merge
2012-09-28 18:45:27 +01:00
flash.now[:warning] = @pull.errors.full_messages.join('. ')
2012-05-24 18:10:49 +01:00
else
@pull.check(false) # don't make event transaction
if @pull.already?
@pull.destroy
2012-10-03 12:36:04 +01:00
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
2012-07-06 18:30:01 +01:00
unless pull_params
raise 'expect pull_request params' # for debug
redirect :back
end
to_project = find_destination_project
2012-10-03 12:36:04 +01:00
authorize! :read, to_project
2012-07-06 18:30:01 +01:00
2012-10-03 12:36:04 +01:00
@pull = to_project.pull_requests.new pull_params
@pull.issue.user, @pull.issue.project, @pull.from_project = current_user, to_project, @project
2012-04-28 18:28:57 +01:00
2012-08-07 18:59:36 +01:00
if @pull.valid? # FIXME more clean/clever logics
2012-10-02 10:14:31 +01:00
@pull.save # set pull id
2012-06-28 14:47:29 +01:00
@pull.check(false) # don't make event transaction
2012-08-07 17:34:22 +01:00
if @pull.already?
@pull.destroy
2012-10-03 12:36:04 +01:00
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)
2012-10-03 12:36:04 +01:00
redirect_to project_pull_request_path(@pull.to_project, @pull)
end
2012-04-28 18:28:57 +01:00
else
2012-09-28 18:45:27 +01:00
flash.now[:error] = t('flash.pull_request.save_error')
flash.now[:warning] = @pull.errors.full_messages.join('. ')
2012-10-03 12:36:04 +01:00
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
2012-04-28 18:28:57 +01:00
render :new
end
end
def update
2012-07-12 15:15:28 +01:00
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
2012-10-03 12:36:04 +01:00
redirect_to project_pull_request_path(@pull.to_project, @pull)
end
2012-05-17 17:47:36 +01:00
def merge
@pull.check
2012-06-27 11:47:08 +01:00
unless @pull.merge!(current_user)
2012-09-28 18:45:27 +01:00
flash.now[:error] = t('flash.pull_request.save_error')
flash.now[:warning] = @pull.errors.full_messages.join('. ')
2012-06-27 11:47:08 +01:00
end
2012-10-03 12:36:04 +01:00
redirect_to project_pull_request_path(@pull.to_project, @pull)
2012-05-17 17:47:36 +01:00
end
def show
load_diff_commits_data
2012-05-17 17:47:36 +01:00
end
def index(status = 200)
@issues_with_pull_request = @project.issues.joins(:pull_request)
@issues_with_pull_request = @issues_with_pull_request.search(params[:search_pull_request])
@opened_issues, @closed_issues = @issues_with_pull_request.not_closed_or_merged.count, @issues_with_pull_request.closed_or_merged.count
if params[:status] == 'closed'
@issues_with_pull_request, @status = @issues_with_pull_request.closed_or_merged, params[:status]
else
@issues_with_pull_request, @status = @issues_with_pull_request.not_closed_or_merged, 'open'
end
@issues_with_pull_request = @issues_with_pull_request.
includes(:assignee, :user, :pull_request).def_order.uniq.
paginate :per_page => 10, :page => params[:page]
if status == 200
render 'index', :layout => request.xhr? ? 'with_sidebar' : 'application'
else
render :status => status, :nothing => true
end
end
2012-10-03 12:36:04 +01:00
def autocomplete_to_project
items = Project.accessible_by(current_ability, :membered) | @project.ancestors
items.select! {|e| Regexp.new(params[:term].downcase).match(e.name_with_owner.downcase) && e.repo.branches.count > 0}
2012-08-10 17:37:21 +01:00
render :json => json_for_autocomplete_base(items)
2012-05-16 17:50:30 +01:00
end
2012-07-06 18:30:01 +01:00
protected
2012-05-16 17:50:30 +01:00
2012-07-06 18:30:01 +01:00
def pull_params
@pull_params ||= params[:pull_request].presence
2012-05-16 17:50:30 +01:00
end
2012-07-06 18:30:01 +01:00
def json_for_autocomplete_base items
items.collect do |project|
2012-08-10 17:37:21 +01:00
hash = {"id" => project.id.to_s, "label" => project.name_with_owner, "value" => project.name_with_owner}
2012-10-01 17:03:08 +01:00
hash[:get_refs_url] = project_refs_list_path(project)
2012-07-06 18:30:01 +01:00
hash
2012-05-16 17:50:30 +01:00
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)
2012-06-07 18:23:28 +01:00
@stats = @pull.diff_stats
@comments, @commentable = @issue.comments, @issue
end
2012-08-07 17:34:22 +01:00
def find_destination_project bang=true
2012-10-03 12:36:04 +01:00
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
2012-10-01 18:43:15 +01:00
end
2012-08-07 17:34:22 +01:00
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
2012-10-03 12:36:04 +01:00
@pull.from_project = @project
@pull.to_ref = (pull_params[:to_ref].presence if pull_params) || @pull.to_project.default_branch
@pull.from_ref = params[:treeish].presence || (pull_params[:from_ref].presence if pull_params) || @pull.from_project.default_branch
2012-08-07 17:34:22 +01:00
end
end