From fee5d9384862af086613c4f09e0fd96f7bd347b8 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Tue, 3 Jun 2014 11:19:21 +0100
Subject: Add cache-busting to request response notification

Users get a new response email, click the link, but get a cached page.
This is a quick fix to ensure they always see the response when clicking
the link.
---
 app/helpers/link_to_helper.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index dd6ffa805..9f63ec583 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -28,7 +28,9 @@ module LinkToHelper
 
     # Incoming / outgoing messages
     def incoming_message_url(incoming_message, options = {})
-        return request_url(incoming_message.info_request, options.merge(:anchor => "incoming-#{incoming_message.id}"))
+        default_options = { :anchor => "incoming-#{ incoming_message.id }",
+                            :nocache => "incoming-#{ incoming_message.id }" }
+        request_url(incoming_message.info_request, options.merge(default_options))
     end
 
     def incoming_message_path(incoming_message)
@@ -36,7 +38,9 @@ module LinkToHelper
     end
 
     def outgoing_message_url(outgoing_message, options = {})
-        request_url(outgoing_message.info_request, options.merge(:anchor => "outgoing-#{outgoing_message.id}"))
+        default_options = { :anchor => "outgoing-#{ outgoing_message.id }",
+                            :nocache => "outgoing-#{ outgoing_message.id }" }
+        request_url(outgoing_message.info_request, options.merge(default_options))
     end
 
     def outgoing_message_path(outgoing_message)
-- 
cgit v1.2.3


From 6bd0bfe7599aee4e55bdd63196d1e2c5cc80129c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Tue, 3 Jun 2014 12:34:00 +0100
Subject: Remove duplication from new correspondence urls

---
 app/helpers/link_to_helper.rb | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 9f63ec583..e5ef2ca39 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -28,23 +28,19 @@ module LinkToHelper
 
     # Incoming / outgoing messages
     def incoming_message_url(incoming_message, options = {})
-        default_options = { :anchor => "incoming-#{ incoming_message.id }",
-                            :nocache => "incoming-#{ incoming_message.id }" }
-        request_url(incoming_message.info_request, options.merge(default_options))
+        message_url(incoming_message, options)
     end
 
     def incoming_message_path(incoming_message)
-        incoming_message_url(incoming_message, :only_path => true)
+        message_path(incoming_message)
     end
 
     def outgoing_message_url(outgoing_message, options = {})
-        default_options = { :anchor => "outgoing-#{ outgoing_message.id }",
-                            :nocache => "outgoing-#{ outgoing_message.id }" }
-        request_url(outgoing_message.info_request, options.merge(default_options))
+        message_url(outgoing_message, options)
     end
 
     def outgoing_message_path(outgoing_message)
-        outgoing_message_url(outgoing_message, :only_path => true)
+        message_path(outgoing_message)
     end
 
     def comment_url(comment, options = {})
@@ -352,5 +348,24 @@ module LinkToHelper
         return url_for(params)
     end
 
+    private
+
+    # Private: Generate a request_url linking to the new correspondence
+    def message_url(message, options = {})
+        message_type = message.class.to_s.gsub('Message', '').downcase
+
+        default_options = { :anchor => "#{ message_type }-#{ message.id }" }
+
+        if options.delete(:cachebust)
+            default_options.merge!(:nocache => "#{ message_type }-#{ message.id }")
+        end
+
+        request_url(message.info_request, options.merge(default_options))
+    end
+
+    def message_path(message)
+      message_url(message, :only_path => true)
+    end
+
 end
 
-- 
cgit v1.2.3


From 77ce9b795c62d8241b22878cf60ca688fa4b44a1 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Tue, 3 Jun 2014 11:35:55 +0100
Subject: Move date helpers to DateTimeHelper

---
 app/helpers/link_to_helper.rb | 62 -------------------------------------------
 1 file changed, 62 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index e5ef2ca39..3709469cf 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -279,68 +279,6 @@ module LinkToHelper
         end
     end
 
-    # Public: Usually-correct format for a DateTime-ish object
-    # To define a new new format define the `simple_date_{FORMAT}` method
-    #
-    # date - a DateTime, Date or Time
-    # opts - a Hash of options (default: { format: :html})
-    #        :format - :html returns a HTML <time> tag
-    #                  :text returns a plain String
-    #
-    # Examples
-    #
-    #   simple_date(Time.now)
-    #   # => "<time>..."
-    #
-    #   simple_date(Time.now, :format => :text)
-    #   # => "March 10, 2014"
-    #
-    # Returns a String
-    # Raises ArgumentError if the format is unrecognized
-    def simple_date(date, opts = {})
-        opts = { :format => :html }.merge(opts)
-        date_formatter = "simple_date_#{ opts[:format] }"
-
-        if respond_to?(date_formatter)
-            send(date_formatter, date)
-        else
-            raise ArgumentError, "Unrecognised format :#{ opts[:format] }"
-        end
-    end
-
-    # Usually-correct HTML formatting of a DateTime-ish object
-    # Use LinkToHelper#simple_date with desired formatting options
-    #
-    # date - a DateTime, Date or Time
-    #
-    # Returns a String
-    def simple_date_html(date)
-        date = date.in_time_zone unless date.is_a? Date
-        time_tag date, simple_date_text(date), :title => date.to_s
-    end
-
-    # Usually-correct plain text formatting of a DateTime-ish object
-    # Use LinkToHelper#simple_date with desired formatting options
-    #
-    # date - a DateTime, Date or Time
-    #
-    # Returns a String
-    def simple_date_text(date)
-        date = date.in_time_zone.to_date unless date.is_a? Date
-
-        date_format = _("simple_date_format")
-        date_format = :long if date_format == "simple_date_format"
-        I18n.l(date, :format => date_format)
-    end
-
-    def simple_time(date)
-        return date.strftime("%H:%M:%S").strip
-    end
-
-    def year_from_date(date)
-        return date.strftime("%Y").strip
-    end
-
     #I18n locale switcher
 
     def locale_switcher(locale, params)
-- 
cgit v1.2.3