Fixed admin -> group -> show

diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index d289d9d..a17b431 100644 (file)
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -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

diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml
index aa608ed..0419f7c 100644 (file)
--- a/app/views/help/markdown.html.haml
+++ b/app/views/help/markdown.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title GitLab Flavored Markdown
 .back_link
-  = link_to help_path do 
+  = link_to help_path do
     ← 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."

diff --git a/features/steps/admin/admin_groups.rb b/features/steps/admin/admin_groups.rb
index 0271348..4cd0716 100644 (file)
--- a/features/steps/admin/admin_groups.rb
+++ b/features/steps/admin/admin_groups.rb
@@ -56,6 +56,4 @@ class AdminGroups < Spinach::FeatureSteps
   def current_group
     @group ||= Group.first
   end
-
 end
-

diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb
index 90d27ad..e3364f0 100644 (file)
--- a/features/steps/group/group.rb
+++ b/features/steps/group/group.rb
@@ -71,7 +71,7 @@ class Groups < Spinach::FeatureSteps
   end
 
   def project
-    current_group.authorized_projects.first
+    current_group.projects.first
   end
 
   def assigned_to_me key