feat: Wiki 過去版取得で更新日時が異なる問題修正(#111) (#207)
#111 Merge remote-tracking branch 'origin/main' into feature/111 Merge branch 'main' into feature/111 #111 Co-authored-by: miteruzo <miteruzo@naver.com> Reviewed-on: #207
This commit was merged in pull request #207.
This commit is contained in:
@@ -154,30 +154,8 @@ 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])
|
||||
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
|
||||
rev = find_revision(page)
|
||||
return head :not_found unless rev
|
||||
|
||||
if rev.redirect?
|
||||
return (
|
||||
@@ -189,8 +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
|
||||
|
||||
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
|
||||
|
||||
def render_wiki_conflict err
|
||||
|
||||
Reference in New Issue
Block a user