jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #4511: Remove delete/undelete controls from the artist index.

Browse Source 
* Only show the delete artist button on the artist edit page.
* Only show the delete pool button on the pool edit page.
* Only show the delete wiki button on the wiki edit page.
This commit is contained in:
evazion
2020-06-27 00:36:48 -05:00
parent f7f72e29b5
commit 3a6e4732bf
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/artists/_secondary_links.html.erb
View File

@@ -15,7 +15,7 @@
<%= subnav_link_to "Edit", edit_artist_path(@artist), :"data-shortcut" => "e" %>
<% end %>
<%= subnav_link_to "History", artist_versions_path(:search => {:artist_id => @artist.id}) %>
<% if policy(@artist).update? %>
<% if current_page?(action: "edit") && policy(@artist).update? %>
<% if @artist.is_deleted? %>
<%= subnav_link_to "Undelete", artist_path(@artist, format: "js"), method: :put, data: {confirm: "Are you sure you want to undelete this artist?", params: "artist[is_deleted]=false"}, remote: true %>
<% else %>

6
app/views/artists/index.html.erb
View File

@@ -32,12 +32,6 @@
<% t.column column: "control" do |artist| %>
<% if policy(artist).update? %>
<%= link_to "Edit", edit_artist_path(artist) %>
<% if artist.is_deleted? %>
| <%= link_to "Undelete", artist_path(artist, artist: { is_deleted: false }), method: :put, remote: true %>
<% else %>
| <%= link_to "Delete", artist_path(artist, artist: { is_deleted: true }), method: :put, remote: true %>
<% end %>
<% end %>
<% end %>
<% end %>

10
app/views/pools/_secondary_links.html.erb
View File

@@ -13,10 +13,12 @@
<% if policy(@pool).update? %>
<%= subnav_link_to "Edit", edit_pool_path(@pool), "data-shortcut": "e" %>
<% end %>
<% if policy(@pool).undelete? %>
<%= subnav_link_to "Undelete", undelete_pool_path(@pool), :method => :post, :remote => true %>
<% elsif policy(@pool).destroy? %>
<%= subnav_link_to "Delete", pool_path(@pool), :method => :delete, :"data-shortcut" => "shift+d", :"data-confirm" => "Are you sure you want to delete this pool?", :remote => true %>
<% if current_page?(action: :edit) %>
<% if policy(@pool).undelete? %>
<%= subnav_link_to "Undelete", undelete_pool_path(@pool), :method => :post, :remote => true %>
<% elsif policy(@pool).destroy? %>
<%= subnav_link_to "Delete", pool_path(@pool), :method => :delete, :"data-shortcut" => "shift+d", :"data-confirm" => "Are you sure you want to delete this pool?", :remote => true %>
<% end %>
<% end %>
<% if PoolVersion.enabled? %>
<%= subnav_link_to "History", pool_versions_path(:search => {:pool_id => @pool.id}) %>

10
app/views/wiki_pages/_secondary_links.html.erb
View File

@@ -16,10 +16,12 @@
<% if policy(@wiki_page).edit? %>
<%= subnav_link_to "Edit", edit_wiki_page_path(@wiki_page.id), "data-shortcut": "e" %>
<% if @wiki_page.is_deleted? %>
<%= subnav_link_to "Undelete", wiki_page_path(@wiki_page.id), remote: true, method: :put, "data-params": "wiki_page[is_deleted]=false", "data-shortcut": "shift+d", "data-confirm": "Are you sure you want to undelete this wiki?" %>
<% else %>
<%= subnav_link_to "Delete", wiki_page_path(@wiki_page.id), remote: true, method: :put, "data-params": "wiki_page[is_deleted]=true", "data-shortcut": "shift+d", "data-confirm": "Are you sure you want to delete this wiki?" %>
<% if current_page?(action: :edit) %>
<% if @wiki_page.is_deleted? %>
<%= subnav_link_to "Undelete", wiki_page_path(@wiki_page.id), remote: true, method: :put, "data-params": "wiki_page[is_deleted]=false", "data-shortcut": "shift+d", "data-confirm": "Are you sure you want to undelete this wiki?" %>
<% else %>
<%= subnav_link_to "Delete", wiki_page_path(@wiki_page.id), remote: true, method: :put, "data-params": "wiki_page[is_deleted]=true", "data-shortcut": "shift+d", "data-confirm": "Are you sure you want to delete this wiki?" %>
<% end %>
<% end %>
<% end %>
<% elsif @wiki_page_version %>