Dont show fork button in personal projects. Point to fork if already forked project

Dmitriy Zaporozhets
1 parent 7b6f2fb1
Showing 4 changed files with 26 additions and 5 deletions Show diff stats
app/models/ability.rb
app/models/user.rb
app/views/projects/_clone_panel.html.haml
app/views/projects/show.html.haml
@@ -69,7 +69,6 @@ class Ability
         :download_code,
         :write_snippet,
         :fork_project
-
       ]
     end
@@ -326,4 +326,18 @@ class User &lt; ActiveRecord::Base
   def tm_of(project)
     project.team_member_by_id(self.id)
   end
+
+  def already_forked? project
+    !!fork_of(project)
+  end
+
+  def fork_of project
+    links = ForkedProjectLink.where(forked_from_project_id: project, forked_to_project_id: personal_projects)
+
+    if links.any?
+      links.first.forked_to_project
+    else
+      nil
+    end
+  end
 end
@@ -5,10 +5,14 @@
     .span3.pull-right
       .pull-right
         - unless @project.empty_repo?
-          - if can? current_user, :fork_project, @project
-            = link_to fork_project_path(@project), title: "Fork", class: "btn grouped", method: "POST" do
-              %i.icon-copy
-              Fork
+          - if can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
+            - if current_user.already_forked?(@project)
+              = link_to project_path(current_user.fork_of(@project)), class: 'btn grouped success' do
+                Forked
+            - else
+              = link_to fork_project_path(@project), title: "Fork", class: "btn grouped", method: "POST" do
+                %i.icon-copy
+                Fork
           - if can? current_user, :download_code, @project
             = link_to archive_project_repository_path(@project), class: "btn grouped" do
               %i.icon-download-alt
@@ -40,3 +40,7 @@
       %p Repo Size: #{@project.repository.size} MB
       %p Created at: #{@project.created_at.stamp('Aug 22, 2013')}
       %p Owner: #{link_to @project.owner_name, @project.owner}
+      - if @project.forked_from_project
+        %p
+          Forked from:
+          = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
	@@ -69,7 +69,6 @@ class Ability		@@ -69,7 +69,6 @@ class Ability
69	:download_code,	69	:download_code,
70	:write_snippet,	70	:write_snippet,
71	:fork_project	71	:fork_project
72	-
73	]	72	]
74	end	73	end
75		74
	@@ -326,4 +326,18 @@ class User < ActiveRecord::Base		@@ -326,4 +326,18 @@ class User < ActiveRecord::Base
326	def tm_of(project)	326	def tm_of(project)
327	project.team_member_by_id(self.id)	327	project.team_member_by_id(self.id)
328	end	328	end
		329	+
		330	+ def already_forked? project
		331	+ !!fork_of(project)
		332	+ end
		333	+
		334	+ def fork_of project
		335	+ links = ForkedProjectLink.where(forked_from_project_id: project, forked_to_project_id: personal_projects)
		336	+
		337	+ if links.any?
		338	+ links.first.forked_to_project
		339	+ else
		340	+ nil
		341	+ end
		342	+ end
329	end	343	end
	@@ -40,3 +40,7 @@		@@ -40,3 +40,7 @@
40	%p Repo Size: #{@project.repository.size} MB	40	%p Repo Size: #{@project.repository.size} MB
41	%p Created at: #{@project.created_at.stamp('Aug 22, 2013')}	41	%p Created at: #{@project.created_at.stamp('Aug 22, 2013')}
42	%p Owner: #{link_to @project.owner_name, @project.owner}	42	%p Owner: #{link_to @project.owner_name, @project.owner}
		43	+ - if @project.forked_from_project
		44	+ %p
		45	+ Forked from:
		46	+ = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)