diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-23 12:22:31 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-23 12:22:31 +0000 |
commit | 8d54d9700746636849bd104f4d18db479492505e (patch) | |
tree | a8d9c209a929b2c6a63dbbf2cbc7f717d264ad6f /app/helpers/sort_helper.rb | |
parent | 7cf2d889d8866226378db250a2c7ec2fc77ef9fc (diff) | |
download | redmine-8d54d9700746636849bd104f4d18db479492505e.tar.gz redmine-8d54d9700746636849bd104f4d18db479492505e.zip |
Simple time tracking functionality added. Time can be logged at issue or project level.
There's no aggregation reports for now, it's just possible to see all time entries for a project or an issue.
A new "activities" enumeration is added.
Permission for a role to log time must be set (new "Time tracking" section in role permissions screen).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@368 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/sort_helper.rb')
-rw-r--r-- | app/helpers/sort_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index 300fbfe54..eac0d4d3f 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -107,10 +107,10 @@ module SortHelper order = 'desc' # changed for desc order by default end caption = titleize(Inflector::humanize(column)) unless caption - params = {:params => {:sort_key => column, :sort_order => order}} + #params = {:params => {:sort_key => column, :sort_order => order}} link_to_remote(caption, - {:update => "content", :url => { :sort_key => column, :sort_order => order}}, - {:href => url_for(:params => { :sort_key => column, :sort_order => order})}) + + {:update => "content", :url => params.update( :sort_key => column, :sort_order => order)}, + {:href => url_for(:params => params.update(:sort_key => column, :sort_order => order))}) + (icon ? nbsp(2) + image_tag(icon) : '') end |