Fixed admin -> group -> show

Dmitriy Zaporozhets
1 parent 67896ea9
Showing 4 changed files with 4 additions and 6 deletions Show diff stats
app/views/admin/groups/show.html.haml
app/views/help/markdown.html.haml
features/steps/admin/admin_groups.rb
features/steps/group/group.rb
@@ -76,7 +76,7 @@
         %tr{class: "user_#{u.id}"}
           %td.name= link_to u.name, admin_user_path(u)
           %td.projects_access
-            - u.projects.in_namespace(@group).each do |project|
+            - u.authorized_projects.in_namespace(@group).each do |project|
               - u_p = u.users_projects.in_project(project).first
               %span
                 = project.name
 %h3.page_title GitLab Flavored Markdown
 .back_link
-  = link_to help_path do 
+  = link_to help_path do
     &larr; to index
 %hr
@@ -120,7 +120,7 @@
         for commits
     -# this example will only be shown if the user has a project with at least one issue
-    - if @project = current_user.projects.first
+    - if @project = current_user.authorized_projects.first
       - if issue = @project.issues.first
         %p For example in your #{link_to @project.name, project_path(@project)} project, writing:
         %pre= "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
@@ -56,6 +56,4 @@ class AdminGroups &lt; Spinach::FeatureSteps
   def current_group
     @group ||= Group.first
   end
-
 end
-
@@ -71,7 +71,7 @@ class Groups &lt; Spinach::FeatureSteps
   end
   def project
-    current_group.authorized_projects.first
+    current_group.projects.first
   end
   def assigned_to_me key
	@@ -76,7 +76,7 @@		@@ -76,7 +76,7 @@
76	%tr{class: "user_#{u.id}"}	76	%tr{class: "user_#{u.id}"}
77	%td.name= link_to u.name, admin_user_path(u)	77	%td.name= link_to u.name, admin_user_path(u)
78	%td.projects_access	78	%td.projects_access
79	- - u.projects.in_namespace(@group).each do \|project\|	79	+ - u.authorized_projects.in_namespace(@group).each do \|project\|
80	- u_p = u.users_projects.in_project(project).first	80	- u_p = u.users_projects.in_project(project).first
81	%span	81	%span
82	= project.name	82	= project.name
1	%h3.page_title GitLab Flavored Markdown	1	%h3.page_title GitLab Flavored Markdown
2	.back_link	2	.back_link
3	- = link_to help_path do	3	+ = link_to help_path do
4	← to index	4	← to index
5	%hr	5	%hr
6		6
	@@ -120,7 +120,7 @@		@@ -120,7 +120,7 @@
120	for commits	120	for commits
121		121
122	-# this example will only be shown if the user has a project with at least one issue	122	-# this example will only be shown if the user has a project with at least one issue
123	- - if @project = current_user.projects.first	123	+ - if @project = current_user.authorized_projects.first
124	- if issue = @project.issues.first	124	- if issue = @project.issues.first
125	%p For example in your #{link_to @project.name, project_path(@project)} project, writing:	125	%p For example in your #{link_to @project.name, project_path(@project)} project, writing:
126	%pre= "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."	126	%pre= "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
	@@ -56,6 +56,4 @@ class AdminGroups < Spinach::FeatureSteps		@@ -56,6 +56,4 @@ class AdminGroups < Spinach::FeatureSteps
56	def current_group	56	def current_group
57	@group \|\|= Group.first	57	@group \|\|= Group.first
58	end	58	end
59	-
60	end	59	end
61	-
	@@ -71,7 +71,7 @@ class Groups < Spinach::FeatureSteps		@@ -71,7 +71,7 @@ class Groups < Spinach::FeatureSteps
71	end	71	end
72		72
73	def project	73	def project
74	- current_group.authorized_projects.first	74	+ current_group.projects.first
75	end	75	end
76		76
77	def assigned_to_me key	77	def assigned_to_me key