Refactored project archive. Improved MR usability form

Dmitriy Zaporozhets
1 parent edd81a79
Showing 5 changed files with 96 additions and 53 deletions Show diff stats
app/controllers/merge_requests_controller.rb
app/controllers/repositories_controller.rb
app/roles/repository.rb
app/views/merge_requests/_form.html.haml
config/routes.rb
@@ -73,29 +73,21 @@ class MergeRequestsController &lt; ApplicationController
     @merge_request = @project.merge_requests.new(params[:merge_request])
     @merge_request.author = current_user
-    respond_to do |format|
-      if @merge_request.save
-        @merge_request.reload_code
-        format.html { redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.' }
-        format.json { render json: @merge_request, status: :created, location: @merge_request }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @merge_request.errors, status: :unprocessable_entity }
-      end
+    if @merge_request.save
+      @merge_request.reload_code
+      redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'
+    else
+      render action: "new" 
     end
   end
   def update
-    respond_to do |format|
-      if @merge_request.update_attributes(params[:merge_request].merge(:author_id_of_changes => current_user.id))
-        @merge_request.reload_code
-        @merge_request.mark_as_unchecked
-        format.html { redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.' }
-        format.json { head :ok }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @merge_request.errors, status: :unprocessable_entity }
-      end
+    if @merge_request.update_attributes(params[:merge_request].merge(:author_id_of_changes => current_user.id))
+      @merge_request.reload_code
+      @merge_request.mark_as_unchecked
+      redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.'
+    else
+      render action: "edit"
     end
   end
@@ -122,7 +114,6 @@ class MergeRequestsController &lt; ApplicationController
     respond_to do |format|
       format.html { redirect_to project_merge_requests_url(@project) }
-      format.json { head :ok }
     end
   end
@@ -27,22 +27,14 @@ class RepositoriesController &lt; ApplicationController
       render_404 and return 
     end
-    ref = params[:ref] || @project.root_ref
-    commit = @project.commit(ref)
-    render_404 and return unless commit
-
-    # Build file path
-    file_name = @project.code + "-" + commit.id.to_s + ".tar.gz"
-    storage_path = File.join(Rails.root, "tmp", "repositories", @project.code)
-    file_path = File.join(storage_path, file_name)
-
-    # Create file if not exists
-    unless File.exists?(file_path)
-      FileUtils.mkdir_p storage_path
-      file = @project.repo.archive_to_file(ref, nil,  file_path)
-    end
-    # Send file to user
-    send_file file_path
+    file_path = @project.archive_repo(params[:ref])
+
+    if file_path
+      # Send file to user
+      send_file file_path
+    else
+      render_404
+    end
   end
 end
@@ -117,4 +117,28 @@ module Repository
   def root_ref? branch
     root_ref == branch
   end
+
+  # Archive Project to .tar.gz
+  #
+  # Already packed repo archives stored at 
+  # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
+  #
+  def archive_repo ref
+    ref = ref || self.root_ref
+    commit = self.commit(ref)
+    return nil unless commit
+
+    # Build file path
+    file_name = self.code + "-" + commit.id.to_s + ".tar.gz"
+    storage_path = File.join(Rails.root, "tmp", "repositories", self.code)
+    file_path = File.join(storage_path, file_name)
+
+    # Create file if not exists
+    unless File.exists?(file_path)
+      FileUtils.mkdir_p storage_path
+      file = self.repo.archive_to_file(ref, nil,  file_path)
+    end
+
+    file_path
+  end
 end
@@ -5,23 +5,43 @@
         - @merge_request.errors.full_messages.each do |msg|
           %li= msg
-  .control-group
-    = f.label :title, :class => "control-label"
-    .controls= f.text_area :title, :class => "input-xxlarge", :maxlength => 255, :rows => 5
-  .control-group
-    = f.label :source_branch, "From", :class => "control-label"
-    .controls
-      = f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
-      .mr_source_commit
-  .control-group
-    = f.label :target_branch, "To", :class => "control-label"
-    .controls
-      = f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
-      .mr_target_commit
+
+
+  %h3.padded.cgray 1. Select Branches
+  .row
+    .span6
+      .ui-box
+        %h5 From (Head Branch)
+        .body 
+          .padded
+            = f.label :source_branch, "From", :class => "control-label"
+            .controls
+              = f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
+        %hr
+        .mr_source_commit
+        .clearfix
+
+    .span6
+      .ui-box
+        %h5 To (Base Branch)
+        .body
+          .padded
+            = f.label :target_branch, "To", :class => "control-label"
+            .controls
+              = f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
+        %hr
+        .mr_target_commit
+        .clearfix
+
+  %h3.padded.cgray 2. Fill info
   .clearfix
     = f.label :assignee_id, "Assign to", :class => "control-label"
     .controls= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
+  .control-group
+    = f.label :title, :class => "control-label"
+    .controls= f.text_field :title, :class => "input-xxlarge pad", :maxlength => 255, :rows => 5
+
   .form-actions
     = f.submit 'Save', :class => "btn-primary btn"
     - if @merge_request.new_record?
@@ -38,14 +58,18 @@
     $('select#merge_request_assignee_id').chosen();
     $('select#merge_request_source_branch').chosen();
     $('select#merge_request_target_branch').chosen();
+    var source_branch = $("#merge_request_source_branch");
+    var target_branch = $("#merge_request_target_branch");
+    
+    $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: source_branch.val() });
+    $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: target_branch.val() });
-
-    $("#merge_request_source_branch").live("change", function() {
+    source_branch.live("change", function() {
       $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });
     });
-    $("#merge_request_target_branch").live("change", function() {
+    target_branch.live("change", function() {
       $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });
     });
   });
 Gitlab::Application.routes.draw do
+  #
+  # Search
+  #
   get 'search' => "search#show"
   # Optionally, enable Resque here
   require 'resque/server'
   mount Resque::Server.new, at: '/info/resque'
+  #
+  # Help
+  #
   get 'help' => 'help#index'
   get 'help/permissions' => 'help#permissions'
   get 'help/workflow' => 'help#workflow'
   get 'help/web_hooks' => 'help#web_hooks'
+  #
+  # Admin Area
+  #
   namespace :admin do
     resources :users do 
       member do 
@@ -44,6 +53,7 @@ Gitlab::Application.routes.draw do
   get "profile", :to => "profile#show"
   get "profile/design", :to => "profile#design"
   put "profile/update", :to => "profile#update"
+  resources :keys
   #
   # Dashboard Area
@@ -53,10 +63,12 @@ Gitlab::Application.routes.draw do
   get "dashboard/merge_requests", :to => "dashboard#merge_requests"
   resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create]
-  resources :keys
   devise_for :users, :controllers => { :omniauth_callbacks => :omniauth_callbacks }
+  #
+  # Project Area
+  #
   resources :projects, :constraints => { :id => /[^\/]+/ }, :except => [:new, :create, :index], :path => "/" do
     member do
       get "team"
	@@ -27,22 +27,14 @@ class RepositoriesController < ApplicationController		@@ -27,22 +27,14 @@ class RepositoriesController < ApplicationController
27	render_404 and return	27	render_404 and return
28	end	28	end
29		29
30	- ref = params[:ref] \|\| @project.root_ref
31	- commit = @project.commit(ref)
32	- render_404 and return unless commit
33	-
34	- # Build file path
35	- file_name = @project.code + "-" + commit.id.to_s + ".tar.gz"
36	- storage_path = File.join(Rails.root, "tmp", "repositories", @project.code)
37	- file_path = File.join(storage_path, file_name)
38	-
39	- # Create file if not exists
40	- unless File.exists?(file_path)
41	- FileUtils.mkdir_p storage_path
42	- file = @project.repo.archive_to_file(ref, nil, file_path)
43	- end
44		30
45	- # Send file to user
46	- send_file file_path	31	+ file_path = @project.archive_repo(params[:ref])
		32	+
		33	+ if file_path
		34	+ # Send file to user
		35	+ send_file file_path
		36	+ else
		37	+ render_404
		38	+ end
47	end	39	end
48	end	40	end
	@@ -117,4 +117,28 @@ module Repository		@@ -117,4 +117,28 @@ module Repository
117	def root_ref? branch	117	def root_ref? branch
118	root_ref == branch	118	root_ref == branch
119	end	119	end
		120	+
		121	+ # Archive Project to .tar.gz
		122	+ #
		123	+ # Already packed repo archives stored at
		124	+ # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
		125	+ #
		126	+ def archive_repo ref
		127	+ ref = ref \|\| self.root_ref
		128	+ commit = self.commit(ref)
		129	+ return nil unless commit
		130	+
		131	+ # Build file path
		132	+ file_name = self.code + "-" + commit.id.to_s + ".tar.gz"
		133	+ storage_path = File.join(Rails.root, "tmp", "repositories", self.code)
		134	+ file_path = File.join(storage_path, file_name)
		135	+
		136	+ # Create file if not exists
		137	+ unless File.exists?(file_path)
		138	+ FileUtils.mkdir_p storage_path
		139	+ file = self.repo.archive_to_file(ref, nil, file_path)
		140	+ end
		141	+
		142	+ file_path
		143	+ end
120	end	144	end
	@@ -5,23 +5,43 @@		@@ -5,23 +5,43 @@
5	- @merge_request.errors.full_messages.each do \|msg\|	5	- @merge_request.errors.full_messages.each do \|msg\|
6	%li= msg	6	%li= msg
7		7
8	- .control-group
9	- = f.label :title, :class => "control-label"
10	- .controls= f.text_area :title, :class => "input-xxlarge", :maxlength => 255, :rows => 5
11	- .control-group
12	- = f.label :source_branch, "From", :class => "control-label"
13	- .controls
14	- = f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
15	- .mr_source_commit
16	- .control-group
17	- = f.label :target_branch, "To", :class => "control-label"
18	- .controls
19	- = f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
20	- .mr_target_commit	8	+
		9	+
		10	+ %h3.padded.cgray 1. Select Branches
		11	+ .row
		12	+ .span6
		13	+ .ui-box
		14	+ %h5 From (Head Branch)
		15	+ .body
		16	+ .padded
		17	+ = f.label :source_branch, "From", :class => "control-label"
		18	+ .controls
		19	+ = f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
		20	+ %hr
		21	+ .mr_source_commit
		22	+ .clearfix
		23	+
		24	+ .span6
		25	+ .ui-box
		26	+ %h5 To (Base Branch)
		27	+ .body
		28	+ .padded
		29	+ = f.label :target_branch, "To", :class => "control-label"
		30	+ .controls
		31	+ = f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
		32	+ %hr
		33	+ .mr_target_commit
		34	+ .clearfix
		35	+
		36	+ %h3.padded.cgray 2. Fill info
21	.clearfix	37	.clearfix
22	= f.label :assignee_id, "Assign to", :class => "control-label"	38	= f.label :assignee_id, "Assign to", :class => "control-label"
23	.controls= f.select(:assignee_id, @project.users.all.collect {\|p\| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")	39	.controls= f.select(:assignee_id, @project.users.all.collect {\|p\| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
24		40
		41	+ .control-group
		42	+ = f.label :title, :class => "control-label"
		43	+ .controls= f.text_field :title, :class => "input-xxlarge pad", :maxlength => 255, :rows => 5
		44	+
25	.form-actions	45	.form-actions
26	= f.submit 'Save', :class => "btn-primary btn"	46	= f.submit 'Save', :class => "btn-primary btn"
27	- if @merge_request.new_record?	47	- if @merge_request.new_record?
	@@ -38,14 +58,18 @@		@@ -38,14 +58,18 @@
38	$('select#merge_request_assignee_id').chosen();	58	$('select#merge_request_assignee_id').chosen();
39	$('select#merge_request_source_branch').chosen();	59	$('select#merge_request_source_branch').chosen();
40	$('select#merge_request_target_branch').chosen();	60	$('select#merge_request_target_branch').chosen();
		61	+ var source_branch = $("#merge_request_source_branch");
		62	+ var target_branch = $("#merge_request_target_branch");
41		63
		64	+
		65	+ $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: source_branch.val() });
		66	+ $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: target_branch.val() });
42		67
43	-
44	- $("#merge_request_source_branch").live("change", function() {	68	+ source_branch.live("change", function() {
45	$.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });	69	$.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });
46	});	70	});
47		71
48	- $("#merge_request_target_branch").live("change", function() {	72	+ target_branch.live("change", function() {
49	$.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });	73	$.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });
50	});	74	});
51	});	75	});