diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-02-14 05:12:18 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-02-15 12:22:24 +1100 |
| commit | 114d00d1c1e2a997d1921ae044ed7d51237b6434 (patch) | |
| tree | cc43438a6113609884709833d795e1b6f074605c | |
| parent | b8654ca1f3e8b26a2f900dacbccce312376ff888 (diff) | |
Make links relative
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 12 | ||||
| -rw-r--r-- | app/views/request/_request_listing_short_via_event.rhtml | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index f32ab9b64..7d0dd7766 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -149,6 +149,10 @@ module LinkToHelper link_to h(user.name), main_url(user_path(user)) end + def user_link(user) + link_to h(user.name), user_path(user) + end + def request_user_link_absolute(request) if request.is_external? request.external_user_name || _("Anonymous user") @@ -157,6 +161,14 @@ module LinkToHelper end end + def request_user_link(request) + if request.is_external? + request.external_user_name || _("Anonymous user") + else + user_link(request.user) + end + end + def user_or_you_link(user) if @user && user == @user link_to h("you"), user_path(user) diff --git a/app/views/request/_request_listing_short_via_event.rhtml b/app/views/request/_request_listing_short_via_event.rhtml index f837d8143..c2f6474a1 100644 --- a/app/views/request/_request_listing_short_via_event.rhtml +++ b/app/views/request/_request_listing_short_via_event.rhtml @@ -6,8 +6,8 @@ end %> <h3><%= link_to highlight_words(info_request.title, @highlight_words), request_path(info_request) %></h3> <p> -<%= _('To {{public_body_link_absolute}}',:public_body_link_absolute => public_body_link_absolute(info_request.public_body))%> -<%= _('by {{user_link_absolute}}',:user_link_absolute => request_user_link_absolute(info_request))%> +<%= _('To {{public_body_link_absolute}}',:public_body_link_absolute => public_body_link(info_request.public_body))%> +<%= _('by {{user_link_absolute}}',:user_link_absolute => request_user_link(info_request))%> <%= simple_date(info_request.created_at) %> </p> </div> |