コミットを比較

...

4 コミット

作成者 SHA1 メッセージ 日付
みてるぞ e4a047773a #111 2026-01-17 09:01:12 +09:00
みてるぞ 3a2fab5d11 Merge remote-tracking branch 'origin/main' into feature/111 2026-01-17 08:41:38 +09:00
みてるぞ 528b786191 Merge branch 'main' into feature/111 2026-01-10 13:40:36 +09:00
みてるぞ d15e3d2221 #111 2026-01-06 01:54:15 +09:00
+13 -25
ファイルの表示
@@ -154,30 +154,8 @@ class WikiPagesController < ApplicationController
def render_wiki_page_or_404 page def render_wiki_page_or_404 page
return head :not_found unless page return head :not_found unless page
if params[:version].present? rev = find_revision(page)
rev = page.wiki_revisions.find_by(id: params[:version]) return head :not_found unless rev
return head :not_found unless rev
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)
return render json: page.as_json(methods: [:title])
.merge(body:, revision_id:, pred:, succ:)
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)
end
if rev.redirect? if rev.redirect?
return ( return (
@@ -189,8 +167,18 @@ class WikiPagesController < ApplicationController
revision_id = rev.id revision_id = rev.id
pred = page.pred_revision_id(revision_id) pred = page.pred_revision_id(revision_id)
succ = page.succ_revision_id(revision_id) succ = page.succ_revision_id(revision_id)
updated_at = rev.created_at
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
def find_revision page
if params[:version].present?
page.wiki_revisions.find_by(id: params[:version])
else
page.current_revision
end
end end
def render_wiki_conflict err def render_wiki_conflict err