Project Team now supports a non-group projects

Dmitriy Zaporozhets
1 parent 209f96be
Showing 1 changed file with 12 additions and 3 deletions Show diff stats
app/models/project_team.rb
@@ -23,7 +23,12 @@ class ProjectTeam
  
   def find user_id
     user = project.users.find_by_id(user_id)
-    user ||= project.group.users.find_by_id(user_id)
+
+    if group
+      user ||= group.users.find_by_id(user_id)
+    end
+
+    user
   end
  
   def get_tm user_id
@@ -106,13 +111,17 @@ class ProjectTeam
  
   def fetch_members(level = nil)
     project_members = project.users_projects
-    group_members = project.group.users_groups
+    group_members = group ? group.users_groups : []
  
     if level
       project_members = project_members.send(level)
-      group_members = group_members.send(level)
+      group_members = group_members.send(level) if group
     end
  
     (project_members + group_members).map(&:user).uniq
   end
+
+  def group
+    project.group
+  end
 end
...	...	@@ -23,7 +23,12 @@ class ProjectTeam
23	23
24	24	def find user_id
25	25	user = project.users.find_by_id(user_id)
26		- user \|\|= project.group.users.find_by_id(user_id)
	26	+
	27	+ if group
	28	+ user \|\|= group.users.find_by_id(user_id)
	29	+ end
	30	+
	31	+ user
27	32	end
28	33
29	34	def get_tm user_id
...	...	@@ -106,13 +111,17 @@ class ProjectTeam
106	111
107	112	def fetch_members(level = nil)
108	113	project_members = project.users_projects
109		- group_members = project.group.users_groups
	114	+ group_members = group ? group.users_groups : []
110	115
111	116	if level
112	117	project_members = project_members.send(level)
113		- group_members = group_members.send(level)
	118	+ group_members = group_members.send(level) if group
114	119	end
115	120
116	121	(project_members + group_members).map(&:user).uniq
117	122	end
	123	+
	124	+ def group
	125	+ project.group
	126	+ end
118	127	end
...	...