Download as
Browse Code »

Commit 6dae749cd03b2864a6ed12061b1869954a9eeaf3

Authored by Rodrigo Souto
1 parent 51fd552d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

time-ago-as-sentence: convert from_time to Time

Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @6dae749
@@ -1149,6 +1149,7 @@ module ApplicationHelper @@ -1149,6 +1149,7 @@ module ApplicationHelper
1149 #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+ 1149 #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
1150 def time_ago_as_sentence(from_time, include_seconds = false) 1150 def time_ago_as_sentence(from_time, include_seconds = false)
1151 to_time = Time.now 1151 to_time = Time.now
  1152 + from_time = Time.parse(from_time.to_s)
1152 from_time = from_time.to_time if from_time.respond_to?(:to_time) 1153 from_time = from_time.to_time if from_time.respond_to?(:to_time)
1153 to_time = to_time.to_time if to_time.respond_to?(:to_time) 1154 to_time = to_time.to_time if to_time.respond_to?(:to_time)
1154 distance_in_minutes = (((to_time - from_time).abs)/60).round 1155 distance_in_minutes = (((to_time - from_time).abs)/60).round