diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-09-17 10:01:37 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-09-17 10:01:37 +0000 |
| commit | aff6fe1f7a835c6b9edf2042ec2ea0f0ccb7abea (patch) | |
| tree | 5e11047da94e76f926270af35e401d2e518df06b /app/views/my | |
| parent | d689abc491cd255c4855354d0b3b75ff6b3ca230 (diff) | |
| download | redmine-aff6fe1f7a835c6b9edf2042ec2ea0f0ccb7abea.tar.gz redmine-aff6fe1f7a835c6b9edf2042ec2ea0f0ccb7abea.zip | |
replace tabs to spaces at app/views/my/blocks/_timelog.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7327 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/my')
| -rw-r--r-- | app/views/my/blocks/_timelog.html.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb index d1994eba5..0c92ab55e 100644 --- a/app/views/my/blocks/_timelog.html.erb +++ b/app/views/my/blocks/_timelog.html.erb @@ -1,9 +1,9 @@ <h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3> <% entries = TimeEntry.find(:all, - :conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today], - :include => [:activity, :project, {:issue => [:tracker, :status]}], - :order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC") + :conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today], + :include => [:activity, :project, {:issue => [:tracker, :status]}], + :order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC") entries_by_day = entries.group_by(&:spent_on) %> |