Mercurial > hg > soundsoftware-site
annotate app/views/my/blocks/_calendar.html.erb @ 1022:f2ec92061fca browsing
Merge from live branch
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Tue, 13 Nov 2012 10:35:40 +0000 |
| parents | c6c2cbd0afee |
| children | 622f24f53b42 |
| rev | line source |
|---|---|
| Chris@0 | 1 <h3><%= l(:label_calendar) %></h3> |
| Chris@0 | 2 |
| Chris@0 | 3 <% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week) |
| Chris@0 | 4 calendar.events = Issue.visible.find :all, |
| Chris@0 | 5 :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], |
| Chris@0 | 6 :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %> |
| Chris@0 | 7 |
| Chris@0 | 8 <%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %> |