refactoring

twinslash · Feb 27, 2013 · 5583c71 · 5583c71
1 parent d75f8d2
commit 5583c71
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 21 deletions.
diff --git a/lib/patches/redmine_group_incognito_patch.rb b/lib/patches/redmine_group_incognito_patch.rb
diff --git a/lib/patches/redmine_helper_patch.rb b/lib/patches/redmine_helper_patch.rb
@@ -10,7 +10,7 @@ def define_project
         if params[:controller] == 'issues'
           params[:project_id] ? Project.find(params[:project_id]) : Issue.find(params[:id]).project
         elsif params[:controller] == 'projects'|| params[:controller] == 'activities' || params[:controller] == 'reports'
-          Project.find(params[:id]) if params[:id]
+          Project.find(params[:id])||@project
         elsif params[:controller] == 'journals'
           Journal.find(params[:id]).issue.project
         end

diff --git a/lib/patches/redmine_user_incognito_patch.rb b/lib/patches/redmine_user_incognito_patch.rb
diff --git a/lib/redmine_user_incognito.rb b/lib/redmine_user_incognito.rb
@@ -2,7 +2,6 @@
 require 'patches/redmine_query_incognito_patch'
 require 'patches/redmine_queries_helper_incognito_patch'
 require 'patches/redmine_attachments_helper_incognito_patch'
-require 'patches/redmine_user_incognito_patch'
 require 'patches/redmine_reports_controller_incognito_patch'
 require 'patches/redmine_versions_helper_incognito_patch'
 require 'patches/redmine_helper_patch'
@@ -13,7 +12,6 @@
   Query.send(:include, RedmineQueryIncognitoPatch)
   QueriesHelper.send(:include, RedmineQueriesHelperIncognitoPatch)
   AttachmentsHelper.send(:include, RedmineAttachmentsHelperIncognitoPatch)
-  User.send(:include, RedmineUserIncognitoPatch)
   ReportsController.send(:include, RedmineReportsControllerIncognitoPatch)
   VersionsHelper.send(:include, RedmineVersionsHelperIncognitoPatch)
 end