#378

backend/app/controllers/wiki_pages_controller.rb

@@ -4,17 +4,18 @@ class WikiPagesController < ApplicationController
   def index
     title = params[:title].to_s.strip
     if title.blank?
-      return render json: WikiPageRepr.base(WikiPage.joins(:tag_name).includes(:tag_name))
+      return render json: WikiPageRepr.base(
+          WikiPage.joins(:tag_name).includes(tag_name: :tag))
     end
 
-    q = WikiPage.joins(:tag_name).includes(:tag_name)
+    q = WikiPage.joins(:tag_name).includes(tag_name: :tag)
         .where('tag_names.name LIKE ?', "%#{ WikiPage.sanitize_sql_like(title) }%")
     render json: WikiPageRepr.base(q.limit(20))
   end
 
   def show
     page = WikiPage.joins(:tag_name)
-                   .includes(:tag_name)
+                   .includes(tag_name: :tag)
                    .find_by(id: params[:id])
     render_wiki_page_or_404 page
   end
@@ -22,7 +23,7 @@ class WikiPagesController < ApplicationController
   def show_by_title
     title = params[:title].to_s.strip
     page = WikiPage.joins(:tag_name)
-                   .includes(:tag_name)
+                   .includes(tag_name: :tag)
                    .find_by(tag_name: { name: title })
     render_wiki_page_or_404 page
   end
@@ -51,7 +52,7 @@ class WikiPagesController < ApplicationController
     from = params[:from].presence
     to = params[:to].presence
 
-    page = WikiPage.joins(:tag_name).includes(:tag_name).find(id)
+    page = WikiPage.joins(:tag_name).includes(tag_name: :tag).find(id)
 
     from_rev = from && page.wiki_revisions.find(from)
     to_rev = to ? page.wiki_revisions.find(to) : page.current_revision
@@ -76,6 +77,7 @@ class WikiPagesController < ApplicationController
 
     render json: { wiki_page_id:      page.id,
                    title:             page.title,
+                   deprecated_at:     page.deprecated_at,
                    older_revision_id: from_rev&.id,
                    newer_revision_id: to_rev.id,
                    diff:              diff_json }
@@ -157,7 +159,7 @@ class WikiPagesController < ApplicationController
   def changes
     id = params[:id].presence
     q = WikiRevision.joins(wiki_page: :tag_name)
-                    .includes(:created_user, wiki_page: :tag_name)
+                    .includes(:created_user, wiki_page: { tag_name: :tag })
                     .order(id: :desc)
     q = q.where(wiki_page_id: id) if id
 
@@ -165,7 +167,9 @@ class WikiPagesController < ApplicationController
       { revision_id:  rev.id,
         pred:         rev.base_revision_id,
         succ:         nil,
-        wiki_page:    { id: rev.wiki_page_id, title: rev.wiki_page.title },
+        wiki_page:    { id: rev.wiki_page_id,
+                        title: rev.wiki_page.title,
+                        deprecated_at: rev.wiki_page.deprecated_at },
         user:         rev.created_user && { id: rev.created_user.id, name: rev.created_user.name },
         kind:         rev.kind,
         message:      rev.message,