uploads: fix My Uploads page showing Admins uploads for other users.
Fix the "My Uploads" page showing Admins all uploads, not just their own uploads. Changes the URL of the My Uploads page from /uploads to /users/:id/uploads.
This commit is contained in:
@@ -30,8 +30,11 @@ class UploadsController < ApplicationController
|
||||
|
||||
def index
|
||||
@mode = params.fetch(:mode, "table")
|
||||
@defaults = { defaults: { status: "completed" }} if request.format.html?
|
||||
@uploads = authorize Upload.visible(CurrentUser.user).paginated_search(params, count_pages: true, **@defaults.to_h)
|
||||
|
||||
@defaults = {}
|
||||
@defaults[:uploader_id] = params[:user_id]
|
||||
@defaults[:status] = "completed" if request.format.html?
|
||||
@uploads = authorize Upload.visible(CurrentUser.user).paginated_search(params, count_pages: true, defaults: @defaults)
|
||||
@uploads = @uploads.includes(:uploader, media_assets: :post, upload_media_assets: { media_asset: :post }) if request.format.html?
|
||||
|
||||
respond_with(@uploads, include: { upload_media_assets: { include: :media_asset }})
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
<li><%= link_to_wiki "Help", "help:posts" %></li>
|
||||
<li><%= link_to("Listing", posts_path) %></li>
|
||||
<li><%= link_to("Upload", new_upload_path) %></li>
|
||||
<li><%= link_to("Upload Listing", uploads_path) %></li>
|
||||
<li><%= link_to("Popular", popular_explore_posts_path) %></li>
|
||||
<li><%= link_to("Curated", curated_explore_posts_path) %></li>
|
||||
<li><%= link_to("Most Viewed", viewed_explore_posts_path) %></li>
|
||||
@@ -121,6 +120,7 @@
|
||||
<% if policy(UserNameChangeRequest).create? %>
|
||||
<li><%= link_to "Change name", new_user_name_change_request_path %></li>
|
||||
<% end %>
|
||||
<li><%= link_to "Uploads", user_uploads_path(CurrentUser.user) %></li>
|
||||
<li><%= link_to "Dmails", dmails_path(search: { folder: "received" }) %></li>
|
||||
<li><%= link_to "Favorites", favorites_path %></li>
|
||||
<li><%= link_to "Favorite groups", favorite_groups_path %></li>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
<span>
|
||||
<strong>Gallery</strong> |
|
||||
<%= link_to "Table", uploads_path(mode: "table") %>
|
||||
<%= link_to "Table", user_uploads_path(CurrentUser.user.id.to_i, mode: "table") %>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
<span>
|
||||
<strong>Gallery</strong> |
|
||||
<%= link_to "Table", uploads_path(mode: "table") %>
|
||||
<%= link_to "Table", user_uploads_path(CurrentUser.user.id.to_i, mode: "table") %>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<% content_for(:secondary_links) do %>
|
||||
<%= subnav_link_to "New Upload", new_upload_path %>
|
||||
<%= subnav_link_to "Batch Upload", batch_uploads_path %> |
|
||||
<%= subnav_link_to "My Uploads", uploads_path(mode: "gallery") %>
|
||||
<%= subnav_link_to "My Uploads", user_uploads_path(CurrentUser.user.id.to_i, mode: "gallery") %>
|
||||
<%= subnav_link_to "All Uploads", media_assets_path %>
|
||||
<%= subnav_link_to "Reverse Image Search", iqdb_queries_path %> |
|
||||
<%= subnav_link_to "Help", wiki_page_path("help:upload") %>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<h1 class="flex-1">My Uploads</h1>
|
||||
|
||||
<span>
|
||||
<%= link_to "Gallery", uploads_path(mode: "gallery") %> |
|
||||
<%= link_to "Gallery", user_uploads_path(CurrentUser.user.id.to_i, mode: "gallery") %> |
|
||||
<strong>Table</strong>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -264,6 +264,7 @@ Rails.application.routes.draw do
|
||||
end
|
||||
resource :password, only: [:edit, :update]
|
||||
resources :api_keys, only: [:new, :create, :edit, :update, :index, :destroy]
|
||||
resources :uploads, only: [:index]
|
||||
|
||||
collection do
|
||||
get :custom_style
|
||||
|
||||
Reference in New Issue
Block a user