Fix merge_requests_controller

-update new to be simplified (set values from parms via rails) instead of doing it by hand -change def merge_request to look up the merge request against the current @project Change-Id: I778c91b87c6da84b73f8f59013c27b74d290d8b1

Fix merge_requests_controller
0e82c981 · Izaak Alpert · fae3f466 · 0e82c981
Commit 0e82c981 authored Jul 17, 2013 by Izaak Alpert
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 11 deletions

merge_requests_controller.rb app/controllers/projects/merge_requests_controller.rb +4 -11

No files found.
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -39,16 +39,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
  end

  def new
-    @merge_request = @project.merge_requests.new(params[:merge_request])
-
-    if params[:merge_request] && params[:merge_request][:source_project_id]
-      @merge_request.source_project = Project.find_by_id(params[:merge_request][:source_project_id])
-    else
-      @merge_request.source_project = @project
-    end
-    if params[:merge_request] && params[:merge_request][:target_project_id]
-      @merge_request.target_project = Project.find_by_id(params[:merge_request][:target_project_id])
-    end
+    @merge_request = MergeRequest.new(params[:merge_request])
+    @merge_request.source_project = @project unless @merge_request.source_project
+    @merge_request.target_project = @project unless @merge_request.target_project
    @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names
    @source_project = @merge_request.source_project
    @merge_request
@@ -138,7 +131,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
  end

  def merge_request
-    @merge_request ||= MergeRequest.find_by_id(params[:id])
+    @merge_request ||= @project.merge_requests.find(params[:id])
  end

  def authorize_modify_merge_request!