diff options
| author | Robin Houston <robin@lenny.robin> | 2011-07-14 02:42:07 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-07-14 02:42:07 +0100 |
| commit | ec9424fc1ec2a2df83f32fa78faec7015f7b493b (patch) | |
| tree | 08132f49d75cc0c934f93b480e7d3de8dd10d5e4 | |
| parent | b7eb025ba51c20398651228405ee76c932bbe2b0 (diff) | |
| parent | 0da365109e24050d4449967ccadd2a105615d758 (diff) | |
Merge branch 'master' into wdtk
| -rw-r--r-- | app/views/request/show.rhtml | 17 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index c8f5f3eed..a61b7aa54 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -32,11 +32,18 @@ <% end %> <p class="subtitle"> - <%= _('{{user}} made this {{law_used_full}} request',:user=>user_link(@info_request.user), :law_used_full=>h(@info_request.law_used_full)) %> - <% if !@user.nil? && @user.admin_page_links? %> - (<%= link_to "admin", request_admin_url(@info_request) %>) - <% end %> - <%= _('to {{public_body}}',:public_body=>public_body_link(@info_request.public_body)) %> + <% if !@user.nil? && @user.admin_page_links? %> + <%= _('{{user}} made this {{law_used_full}} request',:user=>user_link(@info_request.user), :law_used_full=>h(@info_request.law_used_full)) %> + <%= _('to {{public_body}}',:public_body=>public_body_link(@info_request.public_body)) %> + <% else %> + <%= _('{{user}} (<a href="{{user_admin_url}}">admin</a>) made this {{law_used_full}} request (<a href="{{request_admin_url}}">admin</a>) to {{public_body_link}} (<a href="{{public_body_admin_url}}">admin</a>)', + :user => user_link(@info_request.user), + :law_used_full => h(@info_request.law_used_full), + :user_admin_url => user_admin_url(@info_request.user), + :request_admin_url => request_admin_url(@info_request), + :public_body_link => public_body_link(@info_request.public_body), + :public_body_admin_url => public_body_admin_url(@info_request.public_body)) %> + <% end %> </p> <p id="request_status" class="request_icon_line icon_<%= @info_request.calculate_status %>"> diff --git a/config/routes.rb b/config/routes.rb index b3c0d4a7b..175a37a82 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -195,7 +195,7 @@ ActionController::Routing::Routes.draw do |map| rule.admin_rule_update '/admin/censor/update', :action => 'update' rule.admin_rule_destroy '/admin/censor/destroy/:censor_rule_id', :action => 'destroy' end - #map.filter('locale') + map.filter('locale') # Allow downloading Web Service WSDL as a file with an extension |