Apply user project limit only for personal projects. We should not include group…

… projects for user limit

Apply user project limit only for personal projects. We should not include group…
… projects for user limit
Dmitriy Zaporozhets
1 parent 0a0cdc6c
Showing 2 changed files with 4 additions and 4 deletions Show diff stats
app/models/user.rb
app/views/profiles/show.html.haml
@@ -294,12 +294,12 @@ class User &lt; ActiveRecord::Base
   end
  
   def projects_limit_left
-    projects_limit - owned_projects.count
+    projects_limit - personal_projects.count
   end
  
   def projects_limit_percent
     return 100 if projects_limit.zero?
-    (owned_projects.count.to_f / projects_limit) * 100
+    (personal_projects.count.to_f / projects_limit) * 100
   end
  
   def recent_push project_id = nil
@@ -70,9 +70,9 @@
       - unless current_user.projects_limit_left > 100
         %fieldset
           %legend
-            Owned projects:
+            Personal projects:
             %small.pull-right
-              %span= current_user.owned_projects.count
+              %span= current_user.personal_projects.count
               of
               %span= current_user.projects_limit
           .padded
...	...	@@ -294,12 +294,12 @@ class User < ActiveRecord::Base
294	294	end
295	295
296	296	def projects_limit_left
297		- projects_limit - owned_projects.count
	297	+ projects_limit - personal_projects.count
298	298	end
299	299
300	300	def projects_limit_percent
301	301	return 100 if projects_limit.zero?
302		- (owned_projects.count.to_f / projects_limit) * 100
	302	+ (personal_projects.count.to_f / projects_limit) * 100
303	303	end
304	304
305	305	def recent_push project_id = nil
...	...
...	...	@@ -70,9 +70,9 @@
70	70	- unless current_user.projects_limit_left > 100
71	71	%fieldset
72	72	%legend
73		- Owned projects:
	73	+ Personal projects:
74	74	%small.pull-right
75		- %span= current_user.owned_projects.count
	75	+ %span= current_user.personal_projects.count
76	76	of
77	77	%span= current_user.projects_limit
78	78	.padded
...	...