diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb deleted file mode 100644 index cf8b4f65c..000000000 --- a/app/controllers/reports_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -class ReportsController < ApplicationController - respond_to :html, :xml, :json - - def upload_tags - @user = User.find(params[:user_id]) - @upload_reports = Reports::UploadTags.includes(versions: { post: :versions }).for_user(params[:user_id]).order("id desc").paginate(params[:page], :limit => params[:limit]) - respond_with(@upload_reports) - end -end diff --git a/app/logical/reports/upload_tags.rb b/app/logical/reports/upload_tags.rb deleted file mode 100644 index d49996079..000000000 --- a/app/logical/reports/upload_tags.rb +++ /dev/null @@ -1,51 +0,0 @@ -module Reports - class UploadTags < ::Post - def readonly? - true - end - - def api_attributes - [:id, :uploader_id, :uploader_tags, :added_tags, :removed_tags] - end - - def uploader_tags_array - @uploader_tags ||= begin - uploader_versions = versions.where(updater_id: uploader_id) - tags = [] - uploader_versions.each do |version| - tags += version.changes[:added_tags] - tags -= version.changes[:removed_tags] - end - tags.uniq.sort - end - end - - def current_tags_array - latest_tags = tag_array - latest_tags << "rating:#{rating}" if rating.present? - latest_tags << "parent:#{parent_id}" if parent_id.present? - latest_tags << "source:#{source}" if source.present? - latest_tags - end - - def added_tags_array - current_tags_array - uploader_tags_array - end - - def removed_tags_array - uploader_tags_array - current_tags_array - end - - def uploader_tags - uploader_tags_array.join(' ') - end - - def added_tags - added_tags_array.join(' ') - end - - def removed_tags - removed_tags_array.join(' ') - end - end -end diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb index 987cf1c3b..da98d877d 100644 --- a/app/views/users/_statistics.html.erb +++ b/app/views/users/_statistics.html.erb @@ -73,7 +73,7 @@ <%= presenter.upload_count(self) %> <% if presenter.has_uploads? %> - (<%= link_to "tag changes report", reports_upload_tags_path(user_id: user.id) %>) + (<%= link_to "tag changes report", post_versions_path(search: { updater_id: user.id, version: 1 }, type: "current") %>) <% end %> <% if CurrentUser.is_moderator? %> [<%= link_to "sample", posts_path(:tags => "user:#{user.name} order:random limit:300") %>] @@ -130,7 +130,10 @@ Note Changes - <%= presenter.note_version_count(self) %> in <%= presenter.noted_posts_count(self) %> posts + + <%= presenter.note_version_count(self) %> in <%= presenter.noted_posts_count(self) %> posts + (<%= link_to "note changes report", note_versions_path(search: { updater_id: user.id, version: 1 }, type: "current") %>) + diff --git a/config/routes.rb b/config/routes.rb index 8c6e9a25c..69f9134f2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -216,8 +216,6 @@ Rails.application.routes.draw do end resources :artist_commentary_versions, :only => [:index, :show] resource :related_tag, :only => [:show, :update] - get "reports/uploads" => "reports#uploads" - get "reports/upload_tags" => "reports#upload_tags" resources :recommended_posts, only: [:index] resources :robots, only: [:index] resources :saved_searches, :except => [:show] do