【再掲】feat: D & D による上位タグ設定(#184) #211

マージ済み
みてるぞ が 24 個のコミットを feature/184 から main へマージ 2026-01-18 00:52:23 +09:00
コミット 88fc479c27 の変更だけを表示してゐます - すべてのコミットを表示
+9 -21
ファイルの表示
@@ -154,8 +154,7 @@ class WikiPagesController < ApplicationController
def render_wiki_page_or_404 page
return head :not_found unless page
if params[:version].present?
rev = page.wiki_revisions.find_by(id: params[:version])
rev = find_revision(page)
return head :not_found unless rev
if rev.redirect?
@@ -168,29 +167,18 @@ class WikiPagesController < ApplicationController
revision_id = rev.id
pred = page.pred_revision_id(revision_id)
succ = page.succ_revision_id(revision_id)
updated_at = rev.created_at
return render json: page.as_json(methods: [:title])
.merge(body:, revision_id:, pred:, succ:)
render json: page.as_json(methods: [:title])
.merge(body:, revision_id:, pred:, succ:, updated_at:)
end
rev = page.current_revision
unless rev
return render json: page.as_json(methods: [:title])
.merge(body: nil, revision_id: nil, pred: nil, succ: nil)
def find_revision page
if params[:version].present?
page.wiki_revisions.find_by(id: params[:version])
else
page.current_revision
end
if rev.redirect?
return (
redirect_to wiki_page_by_title_path(title: rev.redirect_page.title),
status: :moved_permanently)
end
body = rev.body
revision_id = rev.id
pred = page.pred_revision_id(revision_id)
succ = page.succ_revision_id(revision_id)
render json: page.as_json(methods: [:title]).merge(body:, revision_id:, pred:, succ:)
end
def render_wiki_conflict err