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

eliminate artist undelete action on controller

Browse Source
This commit is contained in:
Albert Yi
2018-06-05 13:16:28 -07:00
parent 52de1fb981
commit c1725f6dc0
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/artists_controller.rb
View File

@@ -74,14 +74,6 @@ class ArtistsController < ApplicationController
redirect_to(artist_path(@artist), :notice => "Artist deleted") redirect_to(artist_path(@artist), :notice => "Artist deleted")
end end
def undelete
if !@artist.deletable_by?(CurrentUser.user)
raise User::PrivilegeError
end
@artist.update_attribute(:is_active, true)
redirect_to(artist_path(@artist), :notice => "Artist undeleted")
end
def revert def revert
@artist = Artist.find(params[:id]) @artist = Artist.find(params[:id])
@version = @artist.versions.find(params[:version_id]) @version = @artist.versions.find(params[:version_id])

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

@@ -15,9 +15,9 @@
<li><%= link_to "History", artist_versions_path(:search => {:artist_id => @artist.id}) %></li> <li><%= link_to "History", artist_versions_path(:search => {:artist_id => @artist.id}) %></li>
<% if @artist.deletable_by?(CurrentUser.user) %> <% if @artist.deletable_by?(CurrentUser.user) %>
<% if @artist.is_active? %> <% if @artist.is_active? %>
<li id="artist-delete"><%= link_to "Delete", artist_path(@artist), :method => :delete, :data => {:confirm => "Are you sure you want to delete this artist?"} %></li> <li id="artist-delete"><%= link_to "Delete", artist_path(@artist), method: :delete, data: {confirm: "Are you sure you want to delete this artist?"} %></li>
<% else %> <% else %>
<li><%= link_to "Undelete", undelete_artist_path(@artist), :method => :post, :data => {:confirm => "Are you sure you want to undelete this artist?"} %></li> <li><%= link_to "Undelete", artist_path(@artist), method: :put, data: {confirm: "Are you sure you want to undelete this artist?", params: {"artist[is_active]" => true}} %></li>
<% end %> <% end %>
<% end %> <% end %>
<% if CurrentUser.is_admin? %> <% if CurrentUser.is_admin? %>

1
config/routes.rb
View File

@@ -74,7 +74,6 @@ Rails.application.routes.draw do
put :revert put :revert
put :ban put :ban
put :unban put :unban
post :undelete
end end
collection do collection do
get :show_or_new get :show_or_new