kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

from or to get variables gets preserved if the other one is missing

Browse source
This commit is contained in:
Martin Cabrera 2017-01-15 01:53:56 +01:00
parent 241e2e875b
commit 0413a7ad03
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/projects/compare_controller.rb
View file

@ -27,8 +27,8 @@ class Projects::CompareController < Projects::ApplicationController
def create
if params[:from].blank? || params[:to].blank?
flash[:alert] = "You must select from and to branches"
byebug
redirect_to namespace_project_compare_index_path
from_to_preservation = from_to_hash(params)
redirect_to namespace_project_compare_index_path(@project.namespace, @project, from_to_preservation)
else
redirect_to namespace_project_compare_path(@project.namespace, @project,
params[:from], params[:to])
@ -62,4 +62,11 @@ class Projects::CompareController < Projects::ApplicationController
@merge_request ||= MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.
find_by(source_project: @project, source_branch: @head_ref, target_branch: @start_ref)
end
def from_to_hash(params)
return_hash = {}
return_hash[:from] = params[:from].presence
return_hash[:to] = params[:to].presence
return_hash
end
end