fixes for rm2.x

This commit is contained in:
Bruno Andrade
2013-08-16 15:32:50 -03:00
parent 193a41aa46
commit dd7c6892f3
2 changed files with 7 additions and 7 deletions

View File

@@ -52,8 +52,8 @@ module RateHelper
url_options[:user_id] ||= options[:user_id]
#####
link_to_remote(caption,
{:update => options[:update] || "content", :url => url_options, :method => options[:method] || :post},
link_to(caption,
{:remote => true, :update => options[:update] || "content", :url => url_options, :method => options[:method] || :post},
{:href => url_for(url_options),
:class => css})
# link_to caption, :remote => true
@@ -88,7 +88,7 @@ module RateHelper
#####
link_to_remote(caption,
{:update => options[:update] || "content", :url => url_options, :method => options[:method] || :post},
{:remote => true, :update => options[:update] || "content", :url => url_options, :method => options[:method] || :post},
{:href => url_for(url_options)}) +
(icon ? nbsp(2) + image_tag(icon) : '')
end

View File

@@ -18,11 +18,11 @@ module RateTimeEntryPatch
module ClassMethods
# Updated the cached cost of all TimeEntries for user and project
def update_cost_cache(user, project=nil)
c = ARCondition.new
c << ["#{TimeEntry.table_name}.user_id = ?", user]
c << ["#{TimeEntry.table_name}.project_id = ?", project] if project
#c = ARCondition.new
c = "#{TimeEntry.table_name}.user_id = %d" % [user.id]
c << " AND #{TimeEntry.table_name}.project_id = %d" % [project.id] if project
TimeEntry.all(:conditions => c.conditions).each do |time_entry|
TimeEntry.all(:conditions => c ).each do |time_entry|
time_entry.save_cached_cost
end
end