* fixed sidebars for loglist, booking list and report

app/concerns/tt_query_concern.rb

@@ -3,10 +3,11 @@ module TtQueryConcern
 
   included do
     class_eval do
-      scope :visible, lambda { |*args|
+      scope :visible, lambda {|*args|
         user = args.shift || User.current
-        base = Project.allowed_to_condition(user, @visibile_permission, *args)
-        scope = joins(:project).where("#{table_name}.project_id IS NULL OR (#{base})")
+        base = Project.allowed_to_condition(user, @visible_permission, *args)
+        scope = joins("LEFT OUTER JOIN #{Project.table_name} ON #{table_name}.project_id = #{Project.table_name}.id").
+            where("#{table_name}.project_id IS NULL OR (#{base})")
 
         if user.admin?
           scope.where("#{table_name}.visibility <> ? OR #{table_name}.user_id = ?", Query::VISIBILITY_PRIVATE, user.id)

app/helpers/report_sidebar_helper.rb

@@ -1,13 +1,8 @@
 module ReportSidebarHelper
   def sidebar_queries
-    unless @sidebar_queries
-      @sidebar_queries = ReportQuery.visible.all(
-          :order => "#{Query.table_name}.name ASC",
-          # Project specific queries and global queries
-          :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
-      )
-    end
-    @sidebar_queries
+    return @sidebar_queries if @sidebar_queries
+    @sidebar_queries = ReportQuery.visible
+    @project.nil? ? @sidebar_queries.where(project_id: nil) : @sidebar_queries.where(project_id: [nil, @project.id])
+    @sidebar_queries.order(name: :asc)
   end
-
-end
+end

app/helpers/time_bookings_sidebar_helper.rb

@@ -1,13 +1,8 @@
 module TimeBookingsSidebarHelper
   def sidebar_queries
-    unless @sidebar_queries
-      @sidebar_queries = TimeBookingQuery.visible.all(
-          :order => "#{Query.table_name}.name ASC",
-          # Project specific queries and global queries
-          :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
-      )
-    end
-    @sidebar_queries
+    return @sidebar_queries if @sidebar_queries
+    @sidebar_queries = TimeBookingQuery.visible
+    @project.nil? ? @sidebar_queries.where(project_id: nil) : @sidebar_queries.where(project_id: [nil, @project.id])
+    @sidebar_queries.order(name: :asc)
   end
-
-end
+end

app/helpers/time_logs_sidebar_helper.rb

@@ -1,12 +1,8 @@
 module TimeLogsSidebarHelper
   def sidebar_queries
-    unless @sidebar_queries
-      @sidebar_queries = TimeLogQuery.visible.all(
-          :order => "#{Query.table_name}.name ASC",
-          # Project specific queries and global queries
-          :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
-      )
-    end
-    @sidebar_queries
+    return @sidebar_queries if @sidebar_queries
+    @sidebar_queries = TimeLogQuery.visible
+    @project.nil? ? @sidebar_queries.where(project_id: nil) : @sidebar_queries.where(project_id: [nil, @project.id])
+    @sidebar_queries.order(name: :asc)
   end
-end
+end

app/helpers/time_trackers_helper.rb

@@ -159,7 +159,7 @@ def time_string2hour(str)
 
   def query_from_id
     unless params[:query_id].blank?
-      query = Query.find(params[:query_id], :conditions => "project_id IS NULL")
+      query = Query.find(params[:query_id])
       raise ::Unauthorized unless query.visible?
       sess_info = {:filters => query.filters, :group_by => query.group_by, :column_names => query.column_names}
       case query.class.name

app/views/tt_bookings_list/index.html.erb

@@ -69,4 +69,8 @@
     <% end %>
 <% end %>
 
+<% content_for :sidebar do %>
+  <%= render_sidebar_queries %>
+<% end %>
+
 <%= context_menu tt_bookings_list_context_menu_path %>

app/views/tt_logs_list/index.html.erb

@@ -69,4 +69,8 @@
     <% end %>
 <% end %>
 
+<% content_for :sidebar do %>
+  <%= render_sidebar_queries %>
+<% end %>
+
 <%= context_menu tt_logs_list_context_menu_path %>

app/views/tt_reporting/index.html.erb

@@ -72,7 +72,7 @@
 <% end %>
 
 <% content_for :sidebar do %>
-
+    <%= render_sidebar_queries %>
     <div id="tt_reporting-sidebar">
       <h3><%=l(:time_tracker_label_menu_tab_reports)%></h3>
       <!--TODO insert statistics here-->