create corresponding events when create branch/tag with UI

Dmitriy Zaporozhets
1 parent 2a37db4c
Showing 4 changed files with 36 additions and 12 deletions Show diff stats
app/controllers/projects/branches_controller.rb
app/controllers/projects/tags_controller.rb
app/models/event.rb
app/models/repository.rb
@@ -12,16 +12,20 @@ class Projects::BranchesController &lt; Projects::ApplicationController
   end
   def create
-    @project.repository.add_branch(params[:branch_name], params[:ref])
+    @repository.add_branch(params[:branch_name], params[:ref])
+
+    if new_branch = @repository.find_branch(params[:branch_name])
+      Event.create_ref_event(@project, current_user, new_branch, 'add')
+    end
     redirect_to project_branches_path(@project)
   end
   def destroy
-    branch = @project.repository.branches.find { |branch| branch.name == params[:id] }
+    branch = @repository.find_branch(params[:id])
-    if branch && @project.repository.rm_branch(branch.name)
-      Event.create_rm_ref(@project, current_user, branch)
+    if branch && @repository.rm_branch(branch.name)
+      Event.create_ref_event(@project, current_user, branch, 'rm')
     end
     respond_to do |format|
@@ -8,20 +8,24 @@ class Projects::TagsController &lt; Projects::ApplicationController
   before_filter :authorize_admin_project!, only: [:destroy]
   def index
-    @tags = Kaminari.paginate_array(@project.repository.tags).page(params[:page]).per(30)
+    @tags = Kaminari.paginate_array(@repository.tags).page(params[:page]).per(30)
   end
   def create
-    @project.repository.add_tag(params[:tag_name], params[:ref])
+    @repository.add_tag(params[:tag_name], params[:ref])
+
+    if new_tag = @repository.find_tag(params[:tag_name])
+      Event.create_ref_event(@project, current_user, new_tag, 'add', 'refs/tags')
+    end
     redirect_to project_tags_path(@project)
   end
   def destroy
-    tag = @project.repository.tags.find { |tag| tag.name == params[:id] }
+    tag = @repository.find_tag(params[:id])
-    if tag && @project.repository.rm_tag(tag.name)
-      Event.create_rm_ref(@project, current_user, tag, 'refs/tags')
+    if tag && @repository.rm_tag(tag.name)
+      Event.create_ref_event(@project, current_user, tag, 'rm', 'refs/tags')
     end
     respond_to do |format|
@@ -55,14 +55,22 @@ class Event &lt; ActiveRecord::Base
       end
     end
-    def create_rm_ref(project, user, ref, prefix = 'refs/heads')
+    def create_ref_event(project, user, ref, action = 'add', prefix = 'refs/heads')
+      if action.to_s == 'add'
+        before = '00000000'
+        after = ref.commit.id
+      else
+        before = ref.commit.id
+        after = '00000000'
+      end
+
       Event.create(
         project: project,
         action: Event::PUSHED,
         data: {
           ref: "#{prefix}/#{ref.name}",
-          before: ref.commit.id,
-          after: '00000000'
+          before: before,
+          after: after
         },
         author_id: user.id
       )
@@ -35,6 +35,14 @@ class Repository
     commits
   end
+  def find_branch(name)
+    branches.find { |branch| branch.name == name }
+  end
+
+  def find_tag(name)
+    tags.find { |tag| tag.name == name }
+  end
+
   def add_branch(branch_name, ref)
     Rails.cache.delete(cache_key(:branch_names))
	@@ -35,6 +35,14 @@ class Repository		@@ -35,6 +35,14 @@ class Repository
35	commits	35	commits
36	end	36	end
37		37
		38	+ def find_branch(name)
		39	+ branches.find { \|branch\| branch.name == name }
		40	+ end
		41	+
		42	+ def find_tag(name)
		43	+ tags.find { \|tag\| tag.name == name }
		44	+ end
		45	+
38	def add_branch(branch_name, ref)	46	def add_branch(branch_name, ref)
39	Rails.cache.delete(cache_key(:branch_names))	47	Rails.cache.delete(cache_key(:branch_names))
40		48