Fail loudly if we forget to whitelist a param instead of silently ignoring it. misc models: convert to strong params. artist commentaries: convert to strong params. * Disallow changing or setting post_id to a nonexistent post. artists: convert to strong params. * Disallow setting `is_banned` in create/update actions. Changing it this way instead of with the ban/unban actions would leave the artist in a partially banned state. bans: convert to strong params. * Disallow changing the user_id after the ban has been created. comments: convert to strong params. favorite groups: convert to strong params. news updates: convert to strong params. post appeals: convert to strong params. post flags: convert to strong params. * Disallow users from setting the `is_deleted` / `is_resolved` flags. ip bans: convert to strong params. user feedbacks: convert to strong params. * Disallow users from setting `disable_dmail_notification` when creating feedbacks. * Disallow changing the user_id after the feedback has been created. notes: convert to strong params. wiki pages: convert to strong params. * Also fix non-Builders being able to delete wiki pages. saved searches: convert to strong params. pools: convert to strong params. * Disallow setting `post_count` or `is_deleted` in create/update actions. janitor trials: convert to strong params. post disapprovals: convert to strong params. * Factor out quick-mod bar to shared partial. * Fix quick-mod bar to use `Post#is_approvable?` to determine visibility of Approve button. dmail filters: convert to strong params. password resets: convert to strong params. user name change requests: convert to strong params. posts: convert to strong params. users: convert to strong params. * Disallow setting password_hash, last_logged_in_at, last_forum_read_at, has_mail, and dmail_filter_attributes[user_id]. * Remove initialize_default_image_size (dead code). uploads: convert to strong params. * Remove `initialize_status` because status already defaults to pending in the database. tag aliases/implications: convert to strong params. tags: convert to strong params. forum posts: convert to strong params. * Disallow changing the topic_id after creating the post. * Disallow setting is_deleted (destroy/undelete actions should be used instead). * Remove is_sticky / is_locked (nonexistent attributes). forum topics: convert to strong params. * merges https://github.com/evazion/danbooru/tree/wip-rails-5.1 * lock pg gem to 0.21 (1.0.0 is incompatible with rails 5.1.4) * switch to factorybot and change all references Co-authored-by: r888888888 <r888888888@gmail.com> Co-authored-by: evazion <noizave@gmail.com> add diffs
134 lines
3.5 KiB
Ruby
134 lines
3.5 KiB
Ruby
class ArtistsController < ApplicationController
|
|
respond_to :html, :xml, :json
|
|
before_action :member_only, :except => [:index, :show, :show_or_new, :banned]
|
|
before_action :builder_only, :only => [:destroy]
|
|
before_action :admin_only, :only => [:ban, :unban]
|
|
before_action :load_artist, :only => [:ban, :unban, :show, :edit, :update, :destroy, :undelete]
|
|
|
|
def new
|
|
@artist = Artist.new_with_defaults(artist_params)
|
|
respond_with(@artist)
|
|
end
|
|
|
|
def edit
|
|
respond_with(@artist)
|
|
end
|
|
|
|
def banned
|
|
@artists = Artist.where("is_banned = ?", true).order("name")
|
|
respond_with(@artists) do |format|
|
|
format.xml do
|
|
render :xml => @artists.to_xml(:include => [:urls], :root => "artists")
|
|
end
|
|
format.json do
|
|
render :json => @artists.to_json(:include => [:urls])
|
|
end
|
|
end
|
|
end
|
|
|
|
def ban
|
|
@artist.ban!
|
|
redirect_to(artist_path(@artist), :notice => "Artist was banned")
|
|
end
|
|
|
|
def unban
|
|
@artist.unban!
|
|
redirect_to(artist_path(@artist), :notice => "Artist was unbanned")
|
|
end
|
|
|
|
def index
|
|
@artists = Artist.includes(:urls).search(search_params).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
|
|
respond_with(@artists) do |format|
|
|
format.xml do
|
|
render :xml => @artists.to_xml(:include => [:urls], :root => "artists")
|
|
end
|
|
format.json do
|
|
render :json => @artists.to_json(:include => [:urls])
|
|
end
|
|
end
|
|
end
|
|
|
|
def show
|
|
@artist = Artist.find(params[:id])
|
|
@post_set = PostSets::Artist.new(@artist)
|
|
respond_with(@artist, methods: [:domains], include: [:urls])
|
|
end
|
|
|
|
def create
|
|
@artist = Artist.create(artist_params)
|
|
respond_with(@artist)
|
|
end
|
|
|
|
def update
|
|
@artist.update(artist_params)
|
|
flash[:notice] = @artist.valid? ? "Artist updated" : @artist.errors.full_messages.join("; ")
|
|
respond_with(@artist)
|
|
end
|
|
|
|
def destroy
|
|
if !@artist.deletable_by?(CurrentUser.user)
|
|
raise User::PrivilegeError
|
|
end
|
|
@artist.update_attribute(:is_active, false)
|
|
redirect_to(artist_path(@artist), :notice => "Artist deleted")
|
|
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
|
|
@artist = Artist.find(params[:id])
|
|
@version = @artist.versions.find(params[:version_id])
|
|
@artist.revert_to!(@version)
|
|
respond_with(@artist)
|
|
end
|
|
|
|
def show_or_new
|
|
@artist = Artist.find_by_name(params[:name])
|
|
if @artist
|
|
redirect_to artist_path(@artist)
|
|
else
|
|
@artist = Artist.new(name: params[:name])
|
|
@post_set = PostSets::Artist.new(@artist)
|
|
respond_with(@artist)
|
|
end
|
|
end
|
|
|
|
def finder
|
|
@artists = Artist.find_artists(params[:url], params[:referer_url])
|
|
|
|
respond_with(@artists) do |format|
|
|
format.xml do
|
|
render :xml => @artists.to_xml(:include => [:sorted_urls], :root => "artists")
|
|
end
|
|
format.json do
|
|
render :json => @artists.to_json(:include => [:sorted_urls])
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def load_artist
|
|
@artist = Artist.find(params[:id])
|
|
end
|
|
|
|
def search_params
|
|
sp = params.fetch(:search, {})
|
|
sp[:name] = params[:name] if params[:name]
|
|
sp.permit!
|
|
end
|
|
|
|
def artist_params
|
|
permitted_params = %i[name other_names other_names_comma group_name url_string notes]
|
|
permitted_params << :is_active if CurrentUser.is_builder?
|
|
|
|
params.fetch(:artist, {}).permit(permitted_params)
|
|
end
|
|
end
|