abce4d2551
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
104 lines
2.8 KiB
Ruby
104 lines
2.8 KiB
Ruby
class WikiPagesController < ApplicationController
|
|
respond_to :html, :xml, :json, :js
|
|
before_action :member_only, :except => [:index, :search, :show, :show_or_new]
|
|
before_action :builder_only, :only => [:destroy]
|
|
before_action :normalize_search_params, :only => [:index]
|
|
|
|
def new
|
|
@wiki_page = WikiPage.new(wiki_page_params)
|
|
respond_with(@wiki_page)
|
|
end
|
|
|
|
def edit
|
|
@wiki_page = WikiPage.find(params[:id])
|
|
respond_with(@wiki_page)
|
|
end
|
|
|
|
def index
|
|
@wiki_pages = WikiPage.search(search_params).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
|
|
respond_with(@wiki_pages) do |format|
|
|
format.html do
|
|
if params[:page].nil? || params[:page].to_i == 1
|
|
if @wiki_pages.length == 1
|
|
redirect_to(wiki_page_path(@wiki_pages.first))
|
|
elsif @wiki_pages.length == 0 && params[:search][:title].present? && params[:search][:title] !~ /\*/
|
|
redirect_to(wiki_pages_path(:search => {:title => "*#{params[:search][:title]}*"}))
|
|
end
|
|
end
|
|
end
|
|
format.xml do
|
|
render :xml => @wiki_pages.to_xml(:root => "wiki-pages")
|
|
end
|
|
end
|
|
end
|
|
|
|
def search
|
|
end
|
|
|
|
def show
|
|
if params[:id] =~ /\A\d+\Z/
|
|
@wiki_page = WikiPage.find(params[:id])
|
|
else
|
|
@wiki_page = WikiPage.find_by_title(params[:id])
|
|
if @wiki_page.nil? && request.format.symbol == :html
|
|
redirect_to show_or_new_wiki_pages_path(:title => params[:id])
|
|
return
|
|
end
|
|
end
|
|
|
|
respond_with(@wiki_page)
|
|
end
|
|
|
|
def create
|
|
@wiki_page = WikiPage.create(wiki_page_params)
|
|
respond_with(@wiki_page)
|
|
end
|
|
|
|
def update
|
|
@wiki_page = WikiPage.find(params[:id])
|
|
@wiki_page.update(wiki_page_params)
|
|
respond_with(@wiki_page)
|
|
end
|
|
|
|
def destroy
|
|
@wiki_page = WikiPage.find(params[:id])
|
|
@wiki_page.update_attributes(:is_deleted => true)
|
|
respond_with(@wiki_page)
|
|
end
|
|
|
|
def revert
|
|
@wiki_page = WikiPage.find(params[:id])
|
|
@version = @wiki_page.versions.find(params[:version_id])
|
|
@wiki_page.revert_to!(@version)
|
|
flash[:notice] = "Page was reverted"
|
|
respond_with(@wiki_page)
|
|
end
|
|
|
|
def show_or_new
|
|
@wiki_page = WikiPage.find_by_title(params[:title])
|
|
if @wiki_page
|
|
redirect_to wiki_page_path(@wiki_page)
|
|
else
|
|
@wiki_page = WikiPage.new(:title => params[:title])
|
|
@artist = Artist.named(@wiki_page.title).active.first
|
|
respond_with(@wiki_page)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def normalize_search_params
|
|
if params[:title]
|
|
params[:search] ||= {}
|
|
params[:search][:title] = params.delete(:title)
|
|
end
|
|
end
|
|
|
|
def wiki_page_params
|
|
permitted_params = %i[title body other_names skip_secondary_validations]
|
|
permitted_params += %i[is_locked is_deleted] if CurrentUser.is_builder?
|
|
|
|
params.require(:wiki_page).permit(permitted_params)
|
|
end
|
|
end
|