From ce484fa9da2edd7e2be98600e2fe81770de31a90 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 2 Jan 2013 20:45:11 +0200
Subject: [PATCH] Fixed admin -> group -> show

---
 app/views/admin/groups/show.html.haml | 2 +-
 app/views/help/markdown.html.haml     | 4 ++--
 features/steps/admin/admin_groups.rb  | 2 --
 features/steps/group/group.rb         | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index d289d9d5..a17b431d 100644
--- 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 aa608ed6..0419f7c1 100644
--- 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
     &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."
diff --git a/features/steps/admin/admin_groups.rb b/features/steps/admin/admin_groups.rb
index 0271348e..4cd07165 100644
--- 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 90d27add..e3364f09 100644
--- 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