Group: new link on dashboard if admin. Fixed people count

randx
1 parent 26045d7a
Showing 4 changed files with 11 additions and 2 deletions Show diff stats
app/controllers/groups_controller.rb
app/roles/account.rb
app/views/dashboard/_groups.html.haml
app/views/groups/people.html.haml
@@ -52,7 +52,7 @@ class GroupsController &lt; ApplicationController
   end
  
   def people
-    @users = group.users
+    @users = group.users.all
   end
  
   protected
@@ -22,6 +22,10 @@ module Account
     projects_limit > my_own_projects.count
   end
  
+  def can_create_group?
+    is_admin?
+  end
+
   def last_activity_project
     projects.first
   end
@@ -3,6 +3,11 @@
     Groups
     %small
       (#{groups.count})
+    - if current_user.can_create_group?
+      %span.right
+        = link_to new_admin_group_path, class: "btn very_small info" do
+          %i.icon-plus
+          New Group
   %ul.unstyled
     - groups.each do |group|
       %li.wll
@@ -2,7 +2,7 @@
   %h5
     People
     %small
-      (#{@users.count})
+      (#{@users.size})
   %ul.unstyled
     - @users.each do |user|
       %li.wll
...	...	@@ -52,7 +52,7 @@ class GroupsController < ApplicationController
52	52	end
53	53
54	54	def people
55		- @users = group.users
	55	+ @users = group.users.all
56	56	end
57	57
58	58	protected
...	...
...	...	@@ -22,6 +22,10 @@ module Account
22	22	projects_limit > my_own_projects.count
23	23	end
24	24
	25	+ def can_create_group?
	26	+ is_admin?
	27	+ end
	28	+
25	29	def last_activity_project
26	30	projects.first
27	31	end
...	...
...	...	@@ -3,6 +3,11 @@
3	3	Groups
4	4	%small
5	5	(#{groups.count})
	6	+ - if current_user.can_create_group?
	7	+ %span.right
	8	+ = link_to new_admin_group_path, class: "btn very_small info" do
	9	+ %i.icon-plus
	10	+ New Group
6	11	%ul.unstyled
7	12	- groups.each do \|group\|
8	13	%li.wll
...	...
...	...	@@ -2,7 +2,7 @@
2	2	%h5
3	3	People
4	4	%small
5		- (#{@users.count})
	5	+ (#{@users.size})
6	6	%ul.unstyled
7	7	- @users.each do \|user\|
8	8	%li.wll
...	...