From f03d71e493085c49e9c0a79c8608becd0b526c00 Mon Sep 17 00:00:00 2001
From: Robin Houston <robin.houston@gmail.com>
Date: Wed, 4 Jul 2012 11:39:27 +0100
Subject: Atom feed approximately working (?)

---
 app/helpers/link_to_helper.rb | 1 +
 1 file changed, 1 insertion(+)

(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 1a86333b6..5bba5d312 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -16,6 +16,7 @@ module LinkToHelper
         params = {:url_title => info_request.url_title, :only_path => true}
         return show_request_url(params.merge(extra_params))
     end
+    alias :info_request_url :request_url
 
     def request_link(info_request, cls=nil )
         link_to h(info_request.title), request_url(info_request), :class => cls
-- 
cgit v1.2.3


From 886a8baef232cce37c829137a8b6a625d16b0504 Mon Sep 17 00:00:00 2001
From: Robin Houston <robin.houston@gmail.com>
Date: Wed, 4 Jul 2012 11:43:35 +0100
Subject: Use fully-qualified URLs in feed

The <link> tags in the feed <entry>s ought to be fully-qualified URLs.
---
 app/helpers/link_to_helper.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(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 5bba5d312..efa20b723 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -16,7 +16,12 @@ module LinkToHelper
         params = {:url_title => info_request.url_title, :only_path => true}
         return show_request_url(params.merge(extra_params))
     end
-    alias :info_request_url :request_url
+    
+    def info_request_url(info_request)
+        # This method is called implicitly by the builder view views/api/new_requests.atom.builder
+        # to construct the URLs for the feed entries. Therefore we return fully-qualified URLs here.
+        return main_url(request_url(info_request))
+    end
 
     def request_link(info_request, cls=nil )
         link_to h(info_request.title), request_url(info_request), :class => cls
-- 
cgit v1.2.3


From d5a43f1aa76c1e0086f08bec9c575d2a41ae9a9b Mon Sep 17 00:00:00 2001
From: Robin Houston <robin.houston@gmail.com>
Date: Wed, 4 Jul 2012 13:45:29 +0100
Subject: Atom feed of request events

We need not only new requests, but new outgoing correspondence
of any sort.

The idea is that this feed will contain any event that would have
triggered an email to be sent to the public body, so can be used
as an alternative, equivalent way to stay up-to-date with happenings
on WDTK (or the Alaveteli installation of choice).
---
 app/helpers/link_to_helper.rb | 6 ------
 1 file changed, 6 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 efa20b723..1a86333b6 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -16,12 +16,6 @@ module LinkToHelper
         params = {:url_title => info_request.url_title, :only_path => true}
         return show_request_url(params.merge(extra_params))
     end
-    
-    def info_request_url(info_request)
-        # This method is called implicitly by the builder view views/api/new_requests.atom.builder
-        # to construct the URLs for the feed entries. Therefore we return fully-qualified URLs here.
-        return main_url(request_url(info_request))
-    end
 
     def request_link(info_request, cls=nil )
         link_to h(info_request.title), request_url(info_request), :class => cls
-- 
cgit v1.2.3


From 049198b25c7033ad6d69ec0907679025a54f89db Mon Sep 17 00:00:00 2001
From: Seb Bacon <seb.bacon@gmail.com>
Date: Mon, 9 Jul 2012 12:42:47 +0100
Subject: Ensure (at least in the most basic cases) that views support recent
 "external request" changes (mainly that InfoRequests no longer necessarily
 have a User).

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

(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 1a86333b6..01332c5ab 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -93,6 +93,14 @@ module LinkToHelper
     def user_link(user, cls=nil)
         link_to h(user.name), user_url(user), :class => cls
     end
+    def user_link_for_request(request, cls=nil)
+        if request.is_external?
+            request.external_user_name || _("Anonymous user")
+        else
+            link_to h(request.user.name), user_url(request.user), :class => cls
+        end
+    end
+
     def user_link_absolute(user)
         link_to h(user.name), main_url(user_url(user))
     end
-- 
cgit v1.2.3