comparison app/models/project.rb @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"

   #   Project.visible_condition(anonymous)    => "((projects.status = 1) AND (projects.is_public = 1))"
   def self.visible_condition(user, options={})
     allowed_to_condition(user, :view_project, options)
   end
 
-  def self.root_visible_by(user=nil)
-    return "#{Project.table_name}.parent_id IS NULL AND " + visible_condition(user)
+  def self.root_visible_by(user, options={})
+    return "#{Project.table_name}.parent_id IS NULL AND " + visible_condition(user, options)
   end
   
   # Returns a SQL conditions string used to find all projects for which +user+ has the given +permission+
   #
   # Valid options: