Fix some reporting links.

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 1fb1e74a43c05b1fc831e4cb7b6ede391761b0ae..f35c3924ad1a1a52eb2fc239478426eb67cba861 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -4,7 +4,7 @@
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t('browse.changeset.title', :id => @changeset.id) %>
   <% if current_user and current_user.id != @changeset.user.id %>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t('browse.changeset.title', :id => @changeset.id) %>
   <% if current_user and current_user.id != @changeset.user.id %>

-    <%= link_to new_issue_url(reportable_id: @changeset.id, reportable_type: @changeset.class.name, referer: request.fullpath), :title => t('browse.changeset.report') do %>
+    <%= link_to new_report_url(reportable_id: @changeset.id, reportable_type: @changeset.class.name), :title => t('browse.changeset.report') do %>

         &nbsp;&#9872;
     <% end %>
   <% end %>
         &nbsp;&#9872;
     <% end %>
   <% end %>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index a7dee697bb5b8cbb7b4a21a1361c69b16fa95579..f292ccd197ac7e3ce4a7261d4c45b26bea115bbd 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -4,7 +4,7 @@
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
   <% if current_user && @note.author && current_user.id != @note.author.id %>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
   <% if current_user && @note.author && current_user.id != @note.author.id %>

-    <%= link_to new_issue_url(reportable_id: @note.id, reportable_type: @note.class.name, referer: request.fullpath), :title => t('browse.note.report') do %>
+    <%= link_to new_report_url(reportable_id: @note.id, reportable_type: @note.class.name), :title => t('browse.note.report') do %>

         &nbsp;&#9872;
     <% end %>
   <% end %>
         &nbsp;&#9872;
     <% end %>
   <% end %>

diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb
index a6cf08888565f5cca75c3626a65eb32d912758b2..ae1386fb2a421f50956a5da97c6fa732aa6acc77 100644 (file)
--- a/app/views/diary_entry/_diary_comment.html.erb
+++ b/app/views/diary_entry/_diary_comment.html.erb
@@ -2,7 +2,7 @@
   <%= user_thumbnail diary_comment.user %>
   <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %>
     <% if current_user and diary_comment.user.id != current_user.id %>
   <%= user_thumbnail diary_comment.user %>
   <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %>
     <% if current_user and diary_comment.user.id != current_user.id %>

-      <%= link_to new_issue_url(reportable_id: diary_comment.id, reportable_type: diary_comment.class.name, referer: request.fullpath), :title => t('diary_entry.diary_comment.report') do %>
+      <%= link_to new_report_url(reportable_id: diary_comment.id, reportable_type: diary_comment.class.name), :title => t('diary_entry.diary_comment.report') do %>

               &nbsp;&#9872;
       <% end %>
     <% end %>
               &nbsp;&#9872;
       <% end %>
     <% end %>

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 68f27ca38fcb50d13f9678b8f331df2ca446db6a..15c60beeb3ace5c7eadae4d99adb9047a3f40319 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -156,7 +156,7 @@
 
     <% if current_user and @this_user.id != current_user.id %>
       <div class="report-button">
 
     <% if current_user and @this_user.id != current_user.id %>
       <div class="report-button">

-         <%= link_to new_issue_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name, referer: request.fullpath), :title => t('user.view.report') do%>
+         <%= link_to new_report_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name), :title => t('user.view.report') do %>

             &nbsp;&#9872;
          <% end %>
       </div>
             &nbsp;&#9872;
          <% end %>
       </div>