Index: app/views/my/blocks/_calendar.rhtml =================================================================== --- app/views/my/blocks/_calendar.rhtml (revision 815) +++ app/views/my/blocks/_calendar.rhtml (working copy) @@ -1,8 +1,19 @@

<%= l(:label_calendar) %>

+<% form_tag() do %> +<%= check_box_tag('cal_hide_not_assigned_to_me', 1, params[:cal_hide_not_assigned_to_me]) %>hide issues not assigned to me +<%= check_box_tag('cal_hide_closed', @user.id, params[:cal_hide_closed]) %>hide closed issues +<%= submit_tag l(:button_apply), :class => 'button-small' %> +<% end %> + +<% +hide_not_assigned_to_me = params[:cal_hide_not_assigned_to_me] == nil ? 0 : 1 +hide_closed = params[:cal_hide_closed] == nil ? 0 : 1 +%> + <% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week) calendar.events = Issue.find :all, - :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt], - :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %> + :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) AND (? = 0 or assigned_to_id = ?) AND (? = 0 or #{IssueStatus.table_name}.is_closed = ?)", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt, hide_not_assigned_to_me, @user.id, hide_closed, false], + :include => [:project, :tracker, :priority, :assigned_to, :status] unless @user.projects.empty? %> <%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %>