From 1de91b9f57898c69639d2e3f8a7fcec5403d1ef4 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sat, 16 May 2026 21:30:27 -0700
Subject: [PATCH 01/12] AO3-6960 Admin post drafts and previews

---
 app/controllers/admin_posts_controller.rb     | 109 ++--
 app/helpers/admin_post_helper.rb              |   5 +-
 app/models/admin_post.rb                      |  26 +-
 app/policies/admin_post_policy.rb             |  22 +-
 app/views/admin/_admin_nav.html.erb           |   7 +
 app/views/admin/_header.html.erb              |   5 +
 app/views/admin_posts/_admin_index.html.erb   |  16 +-
 app/views/admin_posts/_admin_post.html.erb    |  13 +-
 .../admin_posts/_admin_post_blurb.html.erb    |  25 +
 .../admin_posts/_admin_post_form.html.erb     |   8 +-
 app/views/admin_posts/_filters.html.erb       |   2 +-
 .../admin_posts/_posting_fieldset.html.erb    |  26 +
 app/views/admin_posts/drafts.html.erb         |  21 +
 app/views/admin_posts/index.html.erb          |   2 +-
 app/views/admin_posts/index.rss.builder       |   2 +-
 app/views/admin_posts/preview.html.erb        |  21 +
 app/views/admin_posts/show.html.erb           |  18 +-
 app/views/comments/_commentable.html.erb      |  10 +-
 app/views/home/_news_module.html.erb          |   2 +-
 config/locales/controllers/en.yml             |   8 +
 config/locales/views/en.yml                   |  29 ++
 config/routes.rb                              |   5 +
 ...tus_and_publication_date_to_admin_posts.rb |  20 +
 factories/admin_post.rb                       |   7 +
 features/admins/admin_post_draft_news.feature | 162 ++++++
 features/admins/admin_post_news.feature       |  19 +
 features/step_definitions/admin_steps.rb      |  14 +
 features/support/paths.rb                     |   2 +
 .../admin_posts_controller_spec.rb            | 488 ++++++++++--------
 spec/helpers/admin_post_helper_spec.rb        |  41 +-
 spec/models/admin_post_spec.rb                |  26 +
 .../shared_examples/access_shared_examples.rb |  20 +
 32 files changed, 870 insertions(+), 311 deletions(-)
 create mode 100644 app/views/admin_posts/_admin_post_blurb.html.erb
 create mode 100644 app/views/admin_posts/_posting_fieldset.html.erb
 create mode 100644 app/views/admin_posts/drafts.html.erb
 create mode 100755 app/views/admin_posts/preview.html.erb
 create mode 100644 db/migrate/20260509172710_add_posted_status_and_publication_date_to_admin_posts.rb
 create mode 100644 features/admins/admin_post_draft_news.feature

diff --git a/app/controllers/admin_posts_controller.rb b/app/controllers/admin_posts_controller.rb
index 426c71b3d3e..68911673b2a 100644
--- a/app/controllers/admin_posts_controller.rb
+++ b/app/controllers/admin_posts_controller.rb
@@ -2,36 +2,37 @@ class AdminPostsController < Admin::BaseController
 
   before_action :admin_only, except: [:index, :show]
   before_action :load_languages, except: [:show, :destroy]
+  before_action :load_admin_posts, only: [:index, :drafts]
 
   # GET /admin_posts
   def index
-    if params[:tag]
-      @tag = AdminPostTag.find_by(id: params[:tag])
-      if @tag
-        @admin_posts = @tag.admin_posts
-      end
-    end
-    @admin_posts ||= AdminPost
-    if params[:language_id].present? && (@language = Language.find_by(short: params[:language_id]))
-      @admin_posts = @admin_posts.where(language_id: @language.id)
-      @tags = AdminPostTag.distinct.joins(:admin_posts).where(admin_posts: { language_id: @language.id }).order(:name)
-    else
-      @admin_posts = @admin_posts.non_translated
-      @tags = AdminPostTag.order(:name)
-    end
-    @admin_posts = @admin_posts.order('created_at DESC').page(params[:page])
+    @page_subtitle = t(".page_title")
+    @admin_posts = @admin_posts.posted.order(published_at: :desc).page(params[:page])
+  end
+
+  # GET /admin_posts/drafts
+  def drafts
+    authorize AdminPost
+
+    @page_subtitle = t(".page_title")
+    @pagy, @admin_posts = pagy(@admin_posts.unposted.order(created_at: :desc))
   end
 
   # GET /admin_posts/1
   def show
+    @admin_post = AdminPost.find(params[:id])
+    authorize(@admin_post) unless @admin_post.posted?
+
     admin_posts = AdminPost.non_translated
-    @admin_post = AdminPost.find_by(id: params[:id])
-    unless @admin_post
-      raise ActiveRecord::RecordNotFound, "Couldn't find admin post '#{params[:id]}'"
+    if @admin_post.posted?
+      @admin_posts = admin_posts.posted.order(published_at: :desc).limit(8)
+      @previous_admin_post = admin_posts.posted.order(published_at: :desc).where("published_at < ?", @admin_post.published_at).first
+      @next_admin_post = admin_posts.posted.order(published_at: :asc).where("published_at > ?", @admin_post.published_at).first
+    else
+      @admin_posts = admin_posts.unposted.order(created_at: :desc).limit(8)
+      @previous_admin_post = admin_posts.unposted.order(created_at: :desc).where("created_at < ?", @admin_post.created_at).first
+      @next_admin_post = admin_posts.unposted.order(created_at: :asc).where("created_at > ?", @admin_post.created_at).first
     end
-    @admin_posts = admin_posts.order('created_at DESC').limit(8)
-    @previous_admin_post = admin_posts.order('created_at DESC').where('created_at < ?', @admin_post.created_at).first
-    @next_admin_post = admin_posts.order('created_at ASC').where('created_at > ?', @admin_post.created_at).first
     @page_subtitle = @admin_post.title.html_safe
     respond_to do |format|
       format.html # show.html.erb
@@ -39,6 +40,13 @@ def show
     end
   end
 
+  # GET /admin_posts/1/preview
+  def preview
+    @preview_mode = true
+    @admin_post = AdminPost.find(params[:id])
+    authorize(@admin_post)
+  end
+
   # GET /admin_posts/new
   # GET /admin_posts/new.xml
   def new
@@ -55,10 +63,15 @@ def edit
   # POST /admin_posts
   def create
     @admin_post = AdminPost.new(admin_post_params)
+    @admin_post.posted = true if params[:post_button] && !@admin_post&.translated_post&.draft?
+
     authorize @admin_post
-    if @admin_post.save
-      flash[:notice] = ts("Admin Post was successfully created.")
-      redirect_to(@admin_post)
+    if params[:preview_button]
+      @preview_mode = true
+      render action: "preview"
+    elsif !params[:edit_button] && @admin_post.save
+      flash[:notice] = t(".success")
+      redirect_to(admin_post_path(@admin_post))
     else
       render action: "new"
     end
@@ -66,13 +79,37 @@ def create
 
   # PUT /admin_posts/1
   def update
+    @admin_post = AdminPost.find(params[:id])
+    @admin_post.attributes = admin_post_params
+    @admin_post.posted = true if params[:post_button] && !@admin_post&.translated_post&.draft?
+    authorize @admin_post
+
+    if !params[:edit_button] && @admin_post.valid?
+      if params[:preview_button]
+        @preview_mode = true
+        render :preview and return
+      elsif @admin_post.save
+        flash[:notice] = t(".success")
+        redirect_to(@admin_post) and return
+      end
+    end
+
+    render action: "edit"
+  end
+
+  # PUT /admin_posts/1/post
+  def post
     @admin_post = AdminPost.find(params[:id])
     authorize @admin_post
-    if @admin_post.update(admin_post_params)
-      flash[:notice] = ts("Admin Post was successfully updated.")
-      redirect_to(@admin_post)
+
+    @admin_post.posted = true
+
+    if @admin_post.save
+      flash[:notice] = t(".success")
+      redirect_to @admin_post
     else
-      render action: "edit"
+      flash[:error] = t(".error")
+      redirect_to(edit_admin_post_path(@admin_post))
     end
   end
 
@@ -81,7 +118,8 @@ def destroy
     @admin_post = AdminPost.find(params[:id])
     authorize @admin_post
     @admin_post.destroy
-    redirect_to(admin_posts_path)
+
+    redirect_to(@admin_post.posted? ? admin_posts_path : drafts_admin_posts_path)
   end
 
   protected
@@ -90,6 +128,19 @@ def load_languages
     @news_languages = Language.where(id: Locale.all.map(&:language_id)).default_order
   end
 
+  def load_admin_posts
+    @tag = AdminPostTag.find_by(id: params[:tag]) if params[:tag]
+    @admin_posts = @tag&.admin_posts || AdminPost
+
+    if params[:language_id].present? && (@language = Language.find_by(short: params[:language_id]))
+      @admin_posts = @admin_posts.where(language_id: @language.id)
+      @tags = AdminPostTag.distinct.joins(:admin_posts).where(admin_posts: { language_id: @language.id }).order(:name)
+    else
+      @admin_posts = @admin_posts.non_translated
+      @tags = AdminPostTag.order(:name)
+    end
+  end
+
   private
 
   def admin_post_params
diff --git a/app/helpers/admin_post_helper.rb b/app/helpers/admin_post_helper.rb
index e167de609f7..94e30b2c5d5 100644
--- a/app/helpers/admin_post_helper.rb
+++ b/app/helpers/admin_post_helper.rb
@@ -1,6 +1,9 @@
 module AdminPostHelper
   def sorted_translations(admin_post)
-    admin_post.translations.sort_by do |translation|
+    translations = admin_post.translations
+    translations = translations.posted if admin_post.posted?
+
+    translations.sort_by do |translation|
       language = translation.language
       language.sortable_name.blank? ? language.short : language.sortable_name
     end
diff --git a/app/models/admin_post.rb b/app/models/admin_post.rb
index 47ed4a87587..0af1629d0c2 100644
--- a/app/models/admin_post.rb
+++ b/app/models/admin_post.rb
@@ -36,16 +36,22 @@ class AdminPost < ApplicationRecord
 
   scope :non_translated, -> { where("translated_post_id IS NULL") }
 
-  scope :for_homepage, -> { order("created_at DESC").limit(ArchiveConfig.NUMBER_OF_ITEMS_VISIBLE_ON_HOMEPAGE) }
+  scope :for_homepage, -> { posted.order(published_at: :desc).limit(ArchiveConfig.NUMBER_OF_ITEMS_VISIBLE_ON_HOMEPAGE) }
+
+  scope :unposted, -> { where(posted: false) }
+  scope :posted, -> { where(posted: true) }
 
   before_save :inherit_translated_post_comment_permissions, :inherit_translated_post_tags
+  before_save :set_published_at, if: :posted_changed?
   after_save :expire_cached_home_admin_posts, :update_translation_comment_permissions, :update_translation_tags
+  after_save :post_translations, if: :saved_change_to_posted?
   after_destroy :expire_cached_home_admin_posts
 
   # Return the name to link comments to for this object
   def commentable_name
     self.title
   end
+
   def commentable_owners
     begin
         [Admin.find(self.admin_id)]
@@ -54,6 +60,10 @@ def commentable_owners
     end
   end
 
+  def draft?
+    !self.posted?
+  end
+
   def tag_list
     tags.map{ |t| t.name }.join(", ")
   end
@@ -137,4 +147,18 @@ def update_translation_tags
       end
     end
   end
+
+  def set_published_at
+    self.published_at = Time.current if self.posted && !self.published_at
+  end
+
+  def post_translations
+    return if translations.blank? || !self.posted
+
+    transaction do
+      translations.find_each do |post|
+        post.update(posted: true, published_at: self.published_at)
+      end
+    end
+  end
 end
diff --git a/app/policies/admin_post_policy.rb b/app/policies/admin_post_policy.rb
index 957e1c46e53..97f5a46ad88 100644
--- a/app/policies/admin_post_policy.rb
+++ b/app/policies/admin_post_policy.rb
@@ -1,13 +1,25 @@
 class AdminPostPolicy < ApplicationPolicy
   POSTING_ROLES = %w[superadmin board board_assistants_team communications support translation].freeze
+  DRAFTING_ROLES = %w[policy_and_abuse].freeze
 
   def can_post?
     user_has_roles?(POSTING_ROLES)
   end
 
-  alias new? can_post?
-  alias edit? can_post?
-  alias create? can_post?
-  alias update? can_post?
-  alias destroy? can_post?
+  def can_draft?
+    user_has_roles?(DRAFTING_ROLES) || can_post?
+  end
+
+  def edit?
+    can_post? || (@record&.draft? && can_draft?)
+  end
+
+  alias new? can_draft?
+  alias show? can_draft?
+  alias create? edit?
+  alias update? edit?
+  alias destroy? edit?
+  alias post? can_post?
+  alias drafts? can_draft?
+  alias preview? edit?
 end
diff --git a/app/views/admin/_admin_nav.html.erb b/app/views/admin/_admin_nav.html.erb
index e705ea49bb8..59d920ce235 100644
--- a/app/views/admin/_admin_nav.html.erb
+++ b/app/views/admin/_admin_nav.html.erb
@@ -3,10 +3,17 @@
   <li>
     <%= span_if_current t(".ao3_news"), admin_posts_path %>
   </li>
+  <li>
+    <%= span_if_current t(".ao3_news_drafts"), drafts_admin_posts_path %>
+  </li>
   <% if policy(AdminPost).can_post? %>
     <li>
       <%= span_if_current t(".post_ao3_news"), new_admin_post_path %>
     </li>
+  <% elsif policy(AdminPost).can_draft? %>
+    <li>
+      <%= span_if_current t(".draft_ao3_news"), new_admin_post_path %>
+    </li>
   <% end %>
   <% if params[:controller] == "admin_posts" && params[:action] == "edit" %>
     <li>
diff --git a/app/views/admin/_header.html.erb b/app/views/admin/_header.html.erb
index 7fdbb92101b..8c4e3fc15d5 100644
--- a/app/views/admin/_header.html.erb
+++ b/app/views/admin/_header.html.erb
@@ -26,8 +26,13 @@
       <%= link_to t(".nav.posts.admin_posts"), admin_posts_path %>
       <ul class="menu">
         <li><%= link_to t(".nav.posts.news"), admin_posts_path %></li>
+        <% if policy(AdminPost).can_draft? %>
+          <li><%= link_to t(".nav.posts.news_drafts"), drafts_admin_posts_path %></li>
+        <% end %>
         <% if policy(AdminPost).can_post? %>
           <li><%= link_to t(".nav.posts.post_news"), new_admin_post_path %></li>
+        <% elsif policy(AdminPost).can_draft? %>
+          <li><%= link_to t(".nav.posts.draft_news"), new_admin_post_path %></li>
         <% end %>
         <% if policy(ArchiveFaq).translation_access? %>
           <li><%= link_to t(".nav.posts.faqs"), archive_faqs_path %></li>
diff --git a/app/views/admin_posts/_admin_index.html.erb b/app/views/admin_posts/_admin_index.html.erb
index 8a386a1c29b..5e70ca97e48 100644
--- a/app/views/admin_posts/_admin_index.html.erb
+++ b/app/views/admin_posts/_admin_index.html.erb
@@ -1,5 +1,5 @@
 <!--Descriptive page name, messages and instructions-->
-<h2 class="heading"><%= ts("AO3 News (includes Release Notes)") %></h2>
+<h2 class="heading"><%= ts("AO3 News") %></h2>
 <!--/descriptions-->
 <!--subnav-->
 <%= render 'filters' %>
@@ -7,19 +7,9 @@
 <!--/subnav-->
 
 <!--main content-->
-<h3 class="heading"><%= ts("Manage News Postings") %></h3>
+<h3 class="landmark heading"><%= ts("Manage News Postings") %></h3>
 <dl class="news index group">
-  <% @admin_posts.each do |admin_post| %>
-  <dt><%= link_to admin_post.title.html_safe, admin_post %></dt>
-    <dd>
-      <p class="datetime"><%= ts("Created at %{created_date} and updated at %{updated_date}", :created_date => admin_post.created_at, :updated_date => admin_post.updated_at) %></p>
-      <ul class="actions">
-	      <li><%= link_to ts("Show"), admin_post %></li>
-			  <li><%= link_to ts("Edit"), edit_admin_post_path(admin_post) %></li>
-    	  <li><%= link_to ts("Delete"), admin_post, data: {confirm: 'Are you sure?'}, :method => :delete %></li>
-      </ul>
-	  </dd>
-  <% end %>
+	<%= render partial: "admin_post_blurb", collection: @admin_posts, as: :admin_post %>
 </dl>
 <!--/content-->
 <!--subnav-->
diff --git a/app/views/admin_posts/_admin_post.html.erb b/app/views/admin_posts/_admin_post.html.erb
index dc4d6cc2b4e..3651a201257 100644
--- a/app/views/admin_posts/_admin_post.html.erb
+++ b/app/views/admin_posts/_admin_post.html.erb
@@ -7,20 +7,25 @@
 <h4 class="landmark heading"><%= ts("Post Header") %></h4>
 <div class="wrapper">
   <dl class="meta">
-    <dt class="published"><%= ts("Published:") %></dt>
-    <dd class="published"><%= admin_post.created_at %></dd>
+    <% if admin_post.posted? %>
+      <dt class="published"><%= ts("Published:") %></dt>
+      <dd class="published"><%= admin_post.published_at %></dd>
+    <% end %>
     <% if admin_post.translated_post %>
       <dt class="original translations"><%= ts("Original:") %></dt>
       <dd class="original translations"><%= link_to admin_post.translated_post.title, admin_post.translated_post %></dd>
-    <% elsif !admin_post.translations.empty? %>
+    <% else %>
+      <% translations = sorted_translations(admin_post) %>
+      <% unless translations.blank? %>
       <dt class="translations"><%= ts("Translations:") %></dt>
       <dd class="translations">
         <ul class="languages commas">
-          <% for translation in sorted_translations(admin_post) %>
+          <% translations.each do |translation| %>
             <li><%= link_to translation.language.name, translation, lang: translation.language.short %></li>
           <% end %>
         </ul>
       </dd>
+      <% end %>
     <% end %>
     <% if admin_post.tags.length > 0 %>
       <dt class="tags"><%= ts("Tags:") %></dt>
diff --git a/app/views/admin_posts/_admin_post_blurb.html.erb b/app/views/admin_posts/_admin_post_blurb.html.erb
new file mode 100644
index 00000000000..3be142ac27d
--- /dev/null
+++ b/app/views/admin_posts/_admin_post_blurb.html.erb
@@ -0,0 +1,25 @@
+<%# expects admin_post %>
+<dt><%= link_to admin_post.title.html_safe, admin_post %></dt>
+<dd>
+  <p class="datetime">
+    <% if admin_post.posted? %>
+      <%= ts("Published at %{publication_date} (Created at %{created_date} and updated at %{updated_date})", publication_date: admin_post.published_at, created_date: admin_post.created_at, updated_date: admin_post.updated_at) %>
+    <% else %>
+      <%= ts("Created at %{created_date} and updated at %{updated_date}", created_date: admin_post.created_at, updated_date: admin_post.updated_at) %>
+    <% end %>
+  </p>
+  <ul class="actions">
+    <li><%= link_to ts("Show"), admin_post %></li>
+    <% if policy(admin_post).edit? %>
+      <li><%= link_to ts("Edit"), edit_admin_post_path(admin_post) %></li>
+      <% if admin_post.posted %>
+        <li><%= link_to ts("Delete"), admin_post, data: { confirm: ts("Are you sure?") }, method: :delete %></li>
+      <% else %>
+        <% if policy(AdminPost).can_post? && (admin_post.translated_post.blank? || admin_post.translated_post.posted?) %>
+          <li><%= link_to ts("Post Draft"), post_admin_post_path(admin_post), method: :put %></li>
+        <% end %>
+        <li><%= link_to ts("Delete Draft"), admin_post, data: { confirm: ts("Are you sure?") }, method: :delete %></li>
+      <% end %>
+    <% end %>
+  </ul>
+</dd>
diff --git a/app/views/admin_posts/_admin_post_form.html.erb b/app/views/admin_posts/_admin_post_form.html.erb
index 38c3b71561f..60c47f0a6ab 100644
--- a/app/views/admin_posts/_admin_post_form.html.erb
+++ b/app/views/admin_posts/_admin_post_form.html.erb
@@ -94,12 +94,6 @@
       </dl>
     </fieldset>
 
-    <fieldset>
-      <legend><%= ts('Post') %></legend>
-      <h3 class="landmark heading"><%= ts("Post") %></h3>
-      <p class="submit actions">
-        <%= submit_tag ts('Post'), :name => 'post_button' %>
-      </p>
-    </fieldset>
+    <%= render "posting_fieldset", form: f %>
   <% end %>
 </div>
diff --git a/app/views/admin_posts/_filters.html.erb b/app/views/admin_posts/_filters.html.erb
index f5c161a7224..5fef30b08ab 100755
--- a/app/views/admin_posts/_filters.html.erb
+++ b/app/views/admin_posts/_filters.html.erb
@@ -1,5 +1,5 @@
 <h3 class="landmark"><%= ts("Filters") %></h3>
-<%= form_tag admin_posts_path, :method => :get do %>
+<%= form_tag request.path, method: :get do %>
   <p><%= label_tag :tag, ts("Tag:") %>
   <%= select_tag :tag, ('<option></option>' + options_from_collection_for_select(@tags, :id, :name, params[:tag])).html_safe %>
   <%= label_tag :language_id, ts("Language:") %>
diff --git a/app/views/admin_posts/_posting_fieldset.html.erb b/app/views/admin_posts/_posting_fieldset.html.erb
new file mode 100644
index 00000000000..49015d805f6
--- /dev/null
+++ b/app/views/admin_posts/_posting_fieldset.html.erb
@@ -0,0 +1,26 @@
+<%# expects form %>
+<fieldset>
+  <legend><%= t(".legend") %></legend>
+
+  <ul class="actions">
+    <% unless @admin_post.persisted? && @admin_post.posted? %>
+      <li><%= form.submit t(".actions.save_draft"), name: "save_button" %></li>
+    <% end %>
+
+    <% if @preview_mode %>
+      <li><%= submit_tag t(".actions.edit"), name: "edit_button" %>
+    <% else %>
+      <li><%= form.submit t(".actions.preview"), name: "preview_button" %></li>
+    <% end %>
+
+    <% if policy(@admin_post).can_post? %>
+      <li><%= form.submit t(".actions.post"), name: "post_button" %></li>
+    <% end %>
+
+    <li><%= link_to t(".actions.cancel"), if @admin_post.new_record?
+                                            policy(AdminPost).can_post? ? admin_posts_path : drafts_admin_posts_path
+                                          else
+                                            admin_post_path(@admin_post)
+                                          end %></li>
+  </ul>
+</fieldset>
diff --git a/app/views/admin_posts/drafts.html.erb b/app/views/admin_posts/drafts.html.erb
new file mode 100644
index 00000000000..a520a03c7d8
--- /dev/null
+++ b/app/views/admin_posts/drafts.html.erb
@@ -0,0 +1,21 @@
+<div class="news admin home">
+  <!--Descriptive page name, messages and instructions-->
+  <h2 class="heading"><%= ts("AO3 News Drafts") %></h2>
+  <!--/descriptions-->
+  <!--subnav-->
+  <%= render "filters" %>
+  <%= render partial: "admin/admin_nav" %>
+  <!--/subnav-->
+
+  <!--main content-->
+  <h3 class="landmark heading"><%= ts("Manage News Drafts") %></h3>
+  <dl class="news index group">
+    <% @admin_posts.each do |admin_post| %>
+      <%= render "admin_post_blurb", admin_post: admin_post %>
+    <% end %>
+  </dl>
+  <!--/content-->
+  <!--subnav-->
+  <%== pagy_nav(@pagy) %>
+  <!--/subnav-->
+</div>
diff --git a/app/views/admin_posts/index.html.erb b/app/views/admin_posts/index.html.erb
index c5a544869ef..6a3978bfa1b 100755
--- a/app/views/admin_posts/index.html.erb
+++ b/app/views/admin_posts/index.html.erb
@@ -1,5 +1,5 @@
 <div class="news admin home">
-  <% if policy(@admin_posts).can_post? %>
+  <% if policy(AdminPost).can_draft? %>
     <%= render "admin_index" %>
   <% else %>
     <div class="primary header module">
diff --git a/app/views/admin_posts/index.rss.builder b/app/views/admin_posts/index.rss.builder
index d68796d6c22..70843f42c9b 100644
--- a/app/views/admin_posts/index.rss.builder
+++ b/app/views/admin_posts/index.rss.builder
@@ -9,7 +9,7 @@ xml.rss :version => "2.0" do
       xml.item do
         xml.title post.title
         xml.description post.content
-        xml.pubDate post.created_at.to_fs(:rfc822)
+        xml.pubDate post.published_at.to_fs(:rfc822)
         xml.link admin_post_url(post)
         xml.guid admin_post_url(post)
       end
diff --git a/app/views/admin_posts/preview.html.erb b/app/views/admin_posts/preview.html.erb
new file mode 100755
index 00000000000..efb9b768cf9
--- /dev/null
+++ b/app/views/admin_posts/preview.html.erb
@@ -0,0 +1,21 @@
+<div class="admin">
+  <h2 class="heading"><%= t(".page_heading") %></h2>
+  <div class="draft news">
+    <%= render "admin_post", admin_post: @admin_post %>
+  </div>
+  <div class="clear"><!-- presentational --></div>
+
+  <%= form_for(@admin_post) do |f| %>
+    <%= f.hidden_field :title, value: @admin_post.title.to_s %>
+    <%= f.hidden_field :content, value: @admin_post.content.to_s %>
+    <% unless @admin_post.translated_post %>
+      <%= f.hidden_field :tag_list, value: @admin_post.tag_list.to_s %>
+    <% end %>
+    <%= f.hidden_field :language_id, value: @admin_post.language_id.to_s %>
+    <%= f.hidden_field :translated_post_id, value: @admin_post.translated_post_id.to_s %>
+    <%= f.hidden_field :moderated_commenting_enabled, value: @admin_post.moderated_commenting_enabled.to_s %>
+    <%= f.hidden_field :comment_permissions, value: @admin_post.comment_permissions.to_s %>
+
+    <%= render "posting_fieldset", form: f %>
+  <% end %>
+</div>
diff --git a/app/views/admin_posts/show.html.erb b/app/views/admin_posts/show.html.erb
index 3ee21f0839f..fd1d59254a0 100755
--- a/app/views/admin_posts/show.html.erb
+++ b/app/views/admin_posts/show.html.erb
@@ -1,7 +1,13 @@
-<div class="news admin home">
+<div class="news admin<%= ' draft' if @preview_mode || @admin_post.draft? %> home">
   <div class="primary header module">
     <!--Descriptive page name, messages and instructions-->
-    <h2 class="heading"><%= link_to t(".page_heading"), admin_posts_path %></h2>
+    <h2 class="heading">
+      <% if @admin_post.posted? %>
+        <%= link_to t(".page_heading"), admin_posts_path %>
+      <% else %>
+        <%= link_to t(".draft_page_heading"), drafts_admin_posts_path %>
+      <% end %>
+    </h2>
     <div class="icon"></div>
     <!--/descriptions-->
     <!--subnav-->
@@ -10,11 +16,11 @@
         <h4 class="landmark heading"><%= t(".navigation.admin.landmark") %></h4>
         <ul class="management actions">
           <% if policy(@admin_post).edit? %>
-            <li><%= link_to t(".navigation.admin.edit"), edit_admin_post_path(@admin_post) %></li>
+            <li><%= link_to @admin_post.posted? ? t(".navigation.admin.edit") : t(".navigation.admin.edit_draft"), edit_admin_post_path(@admin_post) %></li>
           <% end %>
           <% if policy(@admin_post).destroy? %>
             <li>
-              <%= link_to t(".navigation.admin.delete"),
+              <%= link_to @admin_post.posted? ? t(".navigation.admin.delete") : t(".navigation.admin.delete_draft"),
                     @admin_post,
                     data: { confirm: t(".navigation.admin.confirm_delete") },
                     method: :delete %>
@@ -31,10 +37,10 @@
       <h4 class="landmark heading"><%= t(".navigation.landmark") %></h4>
       <ul class="actions">
         <% if @previous_admin_post %>
-          <li><%= link_to t(".navigation.previous"), @previous_admin_post %></li>
+          <li><%= link_to @admin_post.posted? ? t(".navigation.previous") : t(".navigation.previous_draft"), @previous_admin_post %></li>
         <% end %>
         <% if @next_admin_post %>
-          <li><%= link_to t(".navigation.next"), @next_admin_post %></li>
+          <li><%= link_to @admin_post.posted? ? t(".navigation.next") : t(".navigation.next_draft"), @next_admin_post %></li>
         <% end %>
         <li>
           <%= link_to_rss admin_posts_path(:rss, language_id: @admin_post.language.short) %>
diff --git a/app/views/comments/_commentable.html.erb b/app/views/comments/_commentable.html.erb
index 9a134e7f892..586dc34944c 100644
--- a/app/views/comments/_commentable.html.erb
+++ b/app/views/comments/_commentable.html.erb
@@ -19,15 +19,19 @@
     <% end %>
 
     <% if @previous_admin_post %>
-      <li><%= link_to("Previous Post", @previous_admin_post) %></li>
+      <li><%= link_to(@previous_admin_post.posted? ? t(".actions.previous_post") : t(".actions.previous_draft"), @previous_admin_post) %></li>
     <% end %>
 
     <% if @next_admin_post %>
-      <li><%= link_to("Next Post", @next_admin_post) %></li>
+      <li><%= link_to(@next_admin_post.posted? ? t(".actions.next_post") : t(".actions.next_draft"), @next_admin_post) %></li>
     <% end %>
 
     <% if @admin_post %>
-      <li><%= link_to ts('Back to AO3 News Index'), admin_posts_path %></li>
+      <% if @admin_post.posted? %>
+        <li><%= link_to t(".news_index"), admin_posts_path %></li>
+      <% else %>
+        <li><%= link_to t(".draft_news_index"), drafts_admin_posts_path %></li>
+      <% end %>
     <% end %>
 
     <% if @work && !is_author_of?(@work) && !blocked_by?(@work) && !logged_in_as_admin? %>
diff --git a/app/views/home/_news_module.html.erb b/app/views/home/_news_module.html.erb
index 4ac4b397fd4..c6d5a3d84fc 100644
--- a/app/views/home/_news_module.html.erb
+++ b/app/views/home/_news_module.html.erb
@@ -13,7 +13,7 @@
           </h4>
           <p class="meta">
             <span class="published">
-              <%= ts('Published:') %> <%= time_in_zone(admin_post.created_at) %>
+              <%= ts('Published:') %> <%= time_in_zone(admin_post.published_at) %>
             </span>
             <span class="comments">
               <%= ts('Comments:') %> <%= link_to(admin_post.count_visible_comments, polymorphic_path(admin_post, show_comments: true, anchor: :comments)) %>
diff --git a/config/locales/controllers/en.yml b/config/locales/controllers/en.yml
index 880ebc12684..02c8ab96eb3 100644
--- a/config/locales/controllers/en.yml
+++ b/config/locales/controllers/en.yml
@@ -78,6 +78,14 @@ en:
         success:
           one: Successfully removed pseud %{pseuds} from this work.
           other: Successfully removed pseuds %{pseuds} from this work.
+  admin_posts:
+    create:
+      success: Admin Post was successfully created.
+    post:
+      error: Sorry, that Admin Post could not be posted.
+      success: Admin Post was successfully posted.
+    update:
+      success: Admin Post was successfully updated.
   application:
     access_denied:
       access_denied:
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 630a3291f93..43d3fa7fb5c 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -139,7 +139,9 @@ en:
           invite_user: Invite user
     admin_nav:
       ao3_news: AO3 News
+      ao3_news_drafts: AO3 News Drafts
       archive_faq: Archive FAQ
+      draft_ao3_news: Draft AO3 News
       faq:
         reorder_questions: Reorder Questions
       known_issues: Known Issues
@@ -339,9 +341,11 @@ en:
         locales: Locales
         posts:
           admin_posts: Admin Posts
+          draft_news: Draft AO3 News
           faqs: Archive FAQ
           known_issues: Known Issues
           news: AO3 News
+          news_drafts: AO3 News Drafts
           post_news: Post AO3 News
           wrangling_guidelines: Wrangling Guidelines
         settings: Settings
@@ -521,19 +525,38 @@ en:
         footnote_comment_permissions: Comment permissions from the selected post will replace any permissions selected on this page.
         footnote_tags: Tags from the selected post will replace any tags entered on this page.
         label: Translation of
+    drafts:
+      page_title: AO3 News Drafts
+    index:
+      page_title: AO3 News
+    posting_fieldset:
+      actions:
+        cancel: Cancel
+        edit: Edit
+        post: Post
+        preview: Preview
+        save_draft: Save As Draft
+      legend: Post
+    preview:
+      page_heading: Preview
     show:
+      draft_page_heading: AO3 News Draft
       navigation:
         admin:
           confirm_delete: Are you sure you want to delete this news post?
           delete: Delete Post
+          delete_draft: Delete Draft
           edit: Edit Post
+          edit_draft: Edit Draft
           landmark: Admin Actions
           unreviewed_comments:
             one: Unreviewed Comments (%{count})
             other: Unreviewed Comments (%{count})
         landmark: News Post Navigation
         next: Next Post
+        next_draft: Next Draft
         previous: Previous Post
+        previous_draft: Previous Draft
       page_heading: AO3 News
   admins:
     index:
@@ -878,11 +901,17 @@ en:
     commentable:
       actions:
         comment: Comment
+        next_draft: Next Draft
+        next_post: Next Post
+        previous_draft: Previous Draft
+        previous_post: Previous Post
       add_to_collections_link: Add to Collections
       blocked: Sorry, you have been blocked by one or more of this work's creators.
+      draft_news_index: Back to AO3 News Drafts
       guest_comments_disabled: Sorry, the Archive doesn't allow guests to comment right now.
       invite_to_collections_link: Invite To Collections
       logged_as_admin: Please log out of your admin account to comment.
+      news_index: Back to AO3 News Index
       permissions:
         admin_post:
           alt_action: You can however %{support_link} with any feedback or questions.
diff --git a/config/routes.rb b/config/routes.rb
index 5c5c951551f..eb973a5c858 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -170,6 +170,7 @@
   end
 
   #### ADMIN ####
+  get "/admin_posts/drafts" => "admin_posts#drafts", as: :drafts_admin_posts
   resources :admin_posts do
     resources :comments do
       collection do
@@ -177,6 +178,10 @@
         put :review_all
       end
     end
+    member do
+      put :post
+      get :preview
+    end
   end
 
   namespace :admin do
diff --git a/db/migrate/20260509172710_add_posted_status_and_publication_date_to_admin_posts.rb b/db/migrate/20260509172710_add_posted_status_and_publication_date_to_admin_posts.rb
new file mode 100644
index 00000000000..02223a496d5
--- /dev/null
+++ b/db/migrate/20260509172710_add_posted_status_and_publication_date_to_admin_posts.rb
@@ -0,0 +1,20 @@
+class AddPostedStatusAndPublicationDateToAdminPosts < ActiveRecord::Migration[8.1]
+  uses_departure! if Rails.env.staging? || Rails.env.production?
+
+  def up
+    return if column_exists?(:admin_posts, :posted)
+
+    change_table :admin_posts do |t|
+      t.boolean :posted, default: false, null: false
+      t.datetime :published_at, default: nil, null: true
+    end
+    AdminPost.update_all("published_at = created_at, posted = 1")
+  end
+
+  def down
+    change_table :admin_posts do |t|
+      t.remove :posted
+      t.remove :published_at
+    end
+  end
+end
diff --git a/factories/admin_post.rb b/factories/admin_post.rb
index 109346bec48..e5bda4c8ab3 100644
--- a/factories/admin_post.rb
+++ b/factories/admin_post.rb
@@ -6,5 +6,12 @@
     admin_id { FactoryBot.create(:admin).id }
     title { "AdminPost Title" }
     content { "AdminPost content long enough to pass validation" }
+    posted { true }
+    published_at { Time.current }
+
+    trait :draft do
+      posted { false }
+      published_at { nil }
+    end
   end
 end
diff --git a/features/admins/admin_post_draft_news.feature b/features/admins/admin_post_draft_news.feature
new file mode 100644
index 00000000000..e533654786d
--- /dev/null
+++ b/features/admins/admin_post_draft_news.feature
@@ -0,0 +1,162 @@
+@admin @comments
+Feature: Admin Actions to Draft News
+  In order to post news items
+  As an an admin
+  I want to be able to create drafts and preview my changes
+
+  Scenario: Draft admin posts are only visible in the drafts index
+    Given the admin post "New AO3 News"
+      And the draft admin post "Newer AO3 News"
+    When I am logged in as a "communications" admin
+      And I am on the admin-posts page
+    Then I should see "New AO3 News"
+      And I should not see "Newer AO3 News"
+    When I am on the admin-post drafts page
+    Then I should see "Newer AO3 News"
+      And I should not see "New AO3 News"
+    When I am logged in as "ordinaryuser"
+    And I am on the admin-posts page
+    Then I should see "New AO3 News"
+      And I should not see "Newer AO3 News"
+
+  Scenario: Admins with only drafting permissions cannot post drafts or edit published news
+    Given the admin post "New AO3 News"
+    When I am logged in as a "policy_and_abuse" admin
+      And I am on the admin-posts page
+    Then I should see "New AO3 News"
+      And I should see "Show"
+      And I should not see "Edit"
+      And I should not see "Delete"
+
+  Scenario: Admins with drafting permissions can create, edit and delete drafts
+    Given I am logged in as a "policy_and_abuse" admin
+      And I am on the admin-post drafts page
+      And time is frozen at Tue May 12 12:00:00 UTC 2026
+    When I start to make an admin post
+    Then I should see a button with text "Save As Draft"
+      And I should not see a button with text "Post"
+    When I press "Save As Draft"
+    Then I should see "Admin Post was successfully created."
+      And I should see "AO3 News Draft" within "#main"
+    When time is frozen at Tue May 13 12:34:56 UTC 2026
+      And I follow "Edit Draft"
+      And I fill in "admin_post_title" with "New Post Title"
+      And I press "Save As Draft"
+    Then I should see "Admin Post was successfully updated."
+      And I should see "New Post Title"
+    When I follow "Back to AO3 News Drafts"
+    Then I should see "Created at 2026-05-12 12:00:00 UTC and updated at 2026-05-13 12:34:56 UTC"
+
+  Scenario: Admins with posting permissions can post drafts
+    Given the draft admin post "My Draft Post"
+      And I am logged in as a "communications" admin
+      And I am on the admin-post drafts page
+    Then I should see "My Draft Post"
+    When I follow "Post Draft"
+    Then I should see "Admin Post was successfully posted."
+      And I should see "My Draft Post"
+      And I should see "Published:"
+
+  Scenario: Draft admin posts are sorted by creation time, newest first
+    Given the draft admin post "First Post"
+      And it is currently 1 second from now
+      And the draft admin post "Second Post"
+      And I am logged in as a "policy_and_abuse" admin
+      And I am on the admin-post drafts page
+    Then I "Second Post" should appear before "First Post"
+    When I follow "First Post"
+      And I follow "Next Draft"
+    Then I should see "Second Post" within "#main"
+    When I follow "Previous Draft"
+    Then I should see "First Post" within "#main"
+
+  Scenario: Previewed admin posts are not persisted
+    Given I am logged in as a "communications" admin
+      And the admin post "Perfection"
+    When I start to make an admin post
+      And I press "Preview"
+    Then I should see "Default Admin Post"
+    When I follow "Cancel"
+    Then I should see "AO3 News" within "#main"
+      And I should not see "Default Admin Post"
+    When I follow "Perfection"
+      And I follow "Edit Post"
+      And I fill in "admin_post_title" with "Not so perfect"
+      And I press "Preview"
+    Then I should see "Not so perfect"
+    When I follow "Cancel"
+    Then I should see "Perfection"
+
+  Scenario: Previewed admin posts can be persisted
+    Given I am logged in as a "communications" admin
+      And the admin post "Not so perfect"
+      And I am on the admin-posts page
+    When I follow "Not so perfect"
+      And I follow "Edit Post"
+      And I fill in "admin_post_title" with "Perfection"
+      And I press "Preview"
+    Then I should see "Perfection"
+    When I press "Post"
+    Then I should see "Admin Post was successfully updated."
+      And I should see "Perfection"
+      And I should not see "Not so perfect"
+
+  Scenario: Draft admin posts can be filtered
+    Given I am logged in as a "communications" admin
+      And the draft admin post "Aardvark" with tag "apple"
+      And the draft admin post "Peony" with tag "pear"
+      And I am on the admin-post drafts page
+    Then "apple" should be an option within "Tag"
+      And "pear" should be an option within "Tag"
+    When I select "apple" from "Tag"
+      And I press "Go"
+    Then I should see "Aardvark"
+      And I should not see "Peony"
+
+  Scenario: Translations of draft admin posts can be created, and are posted with the translated post
+    Given basic languages
+      And I am logged in as a "communications" admin
+      And the draft admin post "Aardvark"
+      And the draft admin post "Erdferkel" translating "Aardvark" to "Deutsch"
+      And I am on the admin-post drafts page
+    Then "English" should be an option within "Language"
+      And "Deutsch" should be an option within "Language"
+      And I should see "Aardvark"
+      And I should not see "Erdferkel"
+    When I select "Deutsch" from "Language"
+      And I press "Go"
+    Then I should see "Erdferkel"
+      And I should not see "Aardvark"
+      And I should not see "Post Draft"
+    Then I should see "Erdferkel"
+      And I should not see "Aardvark"
+    When I follow "Erdferkel"
+    Then I should see "Original: Aardvark"
+    When I follow "Aardvark" within "#main"
+    Then I should see "Translations: Deutsch"
+    When I follow "Edit Draft"
+      And I press "Post"
+    Then I should see "Admin Post was successfully updated."
+      And I should see "Translations: Deutsch"
+    When I follow "Deutsch"
+    Then I should see "AO3 News" within "#main"
+      And I should not see "AO3 News Draft" within "#main"
+
+  Scenario: Draft translations of posted admin posts can be posted
+    Given basic languages
+      And I am logged in as a "communications" admin
+      And the admin post "Aardvark"
+      And the draft admin post "Erdferkel" translating "Aardvark" to "Deutsch"
+      And I am on the admin-posts page
+    When I follow "Aardvark"
+    Then I should not see "Translations:"
+    When I am on the admin-post drafts page
+    When I select "Deutsch" from "Language"
+      And I press "Go"
+    Then I should see "Erdferkel"
+    When I follow "Post Draft"
+    Then I should see "Admin Post was successfully posted."
+      And I should see "Erdferkel"
+      And I should see "Original: Aardvark"
+    When I follow "Aardvark" within "#main"
+    Then I should see "Translations: Deutsch"
diff --git a/features/admins/admin_post_news.feature b/features/admins/admin_post_news.feature
index 8b35264b07c..b2449150db9 100755
--- a/features/admins/admin_post_news.feature
+++ b/features/admins/admin_post_news.feature
@@ -277,3 +277,22 @@ Feature: Admin Actions to Post News
       And I should see "Comments (2)"
       And I should not see "Unreviewed Comments"
 
+  Scenario: Admin posts are sorted by publication date, newest first
+    Given time is frozen at "2026-05-16 03:30:00"
+      And the draft admin post "First News Post"
+      And time is frozen at "2026-05-17 04:30:00"
+      And the admin post "Second News Post"
+      And time is frozen at "2026-05-18 05:30:00"
+      And I am logged in as a "communications" admin
+      And I am on the admin-post drafts page
+    Then I should see "First News Post"
+      And I should not see "Second News Post"
+    When I follow "Post Draft"
+    Then I should see "Admin Post was successfully posted."
+    When I follow "Back to AO3 News Index"
+    Then "First News Post" should appear before "Second News Post"
+      And I should see "Published at 2026-05-18 05:30:00 UTC (Created at 2026-05-16 03:30:00 UTC and updated at 2026-05-18 05:30:00 UTC)"
+    When I log out
+      And I am on the homepage
+    Then "First News Post" should appear before "Second News Post"
+      And I should see "Published: Mon 18 May 2026 05:30AM UTC"
diff --git a/features/step_definitions/admin_steps.rb b/features/step_definitions/admin_steps.rb
index 117c6d38b5a..e1e0b40da5a 100644
--- a/features/step_definitions/admin_steps.rb
+++ b/features/step_definitions/admin_steps.rb
@@ -145,6 +145,20 @@
   FactoryBot.create(:admin_post, title: title, comment_permissions: :enable_all)
 end
 
+Given "the draft admin post {string}" do |title|
+  FactoryBot.create(:admin_post, :draft, title: title, comment_permissions: :enable_all)
+end
+
+Given "the draft admin post {string} with tag(s) {string}" do |title, tags|
+  FactoryBot.create(:admin_post, :draft, title: title, comment_permissions: :enable_all, tag_list: tags)
+end
+
+Given "the draft admin post {string} translating {string} to {string}" do |title, translated_title, lang|
+  admin_post = AdminPost.find_by!(title: translated_title)
+  language = Language.find_by!(name: lang)
+  FactoryBot.create(:admin_post, :draft, title: title, comment_permissions: :enable_all, translated_post_id: admin_post.id, language: language)
+end
+
 Given "the fannish next of kin {string} for the user {string}" do |kin, user|
   user = ensure_user(user)
   kin = ensure_user(kin)
diff --git a/features/support/paths.rb b/features/support/paths.rb
index 7f8845055e5..3b4ad411cd5 100644
--- a/features/support/paths.rb
+++ b/features/support/paths.rb
@@ -282,6 +282,8 @@ def path_to(page_name)
     # Admin Pages
     when /^the admin-posts page$/i
       admin_posts_path
+    when /^the admin-post drafts page$/i
+      drafts_admin_posts_path
     when /^the "(.*)" admin post page$/i
       admin_post_path(AdminPost.find_by(title: Regexp.last_match(1)))
     when /^the unreviewed comments page for the admin post "(.*)"$/i
diff --git a/spec/controllers/admin_posts_controller_spec.rb b/spec/controllers/admin_posts_controller_spec.rb
index a3b3bda11f3..c5f6d531754 100644
--- a/spec/controllers/admin_posts_controller_spec.rb
+++ b/spec/controllers/admin_posts_controller_spec.rb
@@ -4,6 +4,9 @@
   include LoginMacros
   include RedirectExpectationHelper
 
+  posting_roles = %w[superadmin board board_assistants_team communications support translation].freeze
+  drafting_roles = (posting_roles | %w[policy_and_abuse]).freeze
+
   describe "GET #index" do
     context "when filtering by language" do
       let(:translated_post1) { create(:admin_post, tag_list: "xylophone,aardvark") }
@@ -20,7 +23,24 @@
     end
   end
 
+  describe "GET #drafts" do
+    subject { get :drafts }
+    let(:success) { expect(response).to render_template(:drafts) }
+
+    it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+    it_behaves_like "an action that non-admins cannot access"
+  end
+
   describe "GET #show" do
+    context "when admin post is a draft" do
+      let(:admin_post) { create(:admin_post, :draft) }
+      subject { get :show, params: { id: admin_post.id } }
+      let(:success) { expect(response).to render_template(:show) }
+
+      it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+      it_behaves_like "an action that non-admins cannot access"
+    end
+
     context "when admin post does not exist" do
       it "raises an error" do
         expect do
@@ -30,141 +50,228 @@
     end
   end
 
+  describe "GET #preview" do
+    subject { get :preview, params: { id: admin_post.id } }
+    let(:success) { expect(response).to render_template(:preview) }
+
+    context "when admin post is a draft" do
+      let(:admin_post) { create(:admin_post, :draft) }
+
+      it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+      it_behaves_like "an action that non-admins cannot access"
+    end
+
+    context "when admin post is not a draft" do
+      let(:admin_post) { create(:admin_post) }
+
+      it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+      it_behaves_like "an action that non-admins cannot access"
+    end
+
+    context "when admin post does not exist" do
+      it "raises an error" do
+        fake_login_admin(create(:superadmin))
+        expect do
+          get :preview, params: { id: "999999999" }
+        end.to raise_error ActiveRecord::RecordNotFound
+      end
+    end
+  end
+
+  describe "GET #new" do
+    subject { get :new }
+    let(:success) { expect(response).to render_template(:new) }
+
+    it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+    it_behaves_like "an action that non-admins cannot access"
+  end
+
+  describe "GET #edit" do
+    subject { get :edit, params: { id: admin_post.id } }
+    let(:success) { expect(response).to render_template(:edit) }
+
+    context "when the post is a draft" do
+      let(:admin_post) { create(:admin_post, :draft) }
+
+      it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+      it_behaves_like "an action that non-admins cannot access"
+    end
+
+    context "when the post is not a draft" do
+      let(:admin_post) { create(:admin_post) }
+
+      it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+      it_behaves_like "an action that non-admins cannot access"
+    end
+  end
+
   describe "POST #create" do
-    let(:base_params) { { title: "AdminPost Title",
-                          content: "AdminPost content long enough to pass validation" } }
+    let(:params) { { admin_post: { title: "AdminPost Title", content: "Cool new admin post content" } } }
+    subject { post :create, params: params }
+    let(:success) { it_redirects_to_with_notice(admin_post_path(assigns[:admin_post]), "Admin Post was successfully created.") }
+
+    context "when admin post is valid" do
+      context "when the post is a draft" do
+        let(:params) { super().merge(save_button: "Save As Draft") }
 
-    authorized_roles = %w[superadmin board board_assistants_team communications support translation]
-    unauthorized_roles = Admin::VALID_ROLES - authorized_roles
+        it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+        it_behaves_like "an action that non-admins cannot access"
+      end
 
-    context "when admin does not have correct authorization" do
-      let(:admin) { create(:admin) }
+      context "when the post is not a draft" do
+        let(:params) { super().merge(post_button: "Post") }
 
-      unauthorized_roles.each do |admin_role|
-        context "with #{admin_role}" do
-          it "redirects with error" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            post :create, params: { admin_post: base_params }
+        it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+        it_behaves_like "an action that non-admins cannot access"
+      end
 
-            it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
-          end
+      context "when the post is previewed" do
+        let(:params) { super().merge(preview_button: "Preview") }
+        let(:success) do
+          expect(response).to render_template(:preview)
+          expect(AdminPost.count).to eql(0)
         end
+
+        it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+        it_behaves_like "an action that non-admins cannot access"
       end
 
-      context "with no role" do
-        it "redirects with error" do
-          admin.update!(roles: [])
-          fake_login_admin(admin)
-          post :create, params: { admin_post: base_params }
+      context "with unposted translated post" do
+        let(:admin_post) { create(:admin_post, :draft) }
+        let(:params) { super().deep_merge(post_button: "Post", admin_post: { translated_post_id: admin_post.id, language_id: create(:language).id }) }
+        before { fake_login_admin(create(:superadmin)) }
 
-          it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
+        it "will always be a draft" do
+          subject
+
+          it_redirects_to_with_notice(admin_post_path(assigns[:admin_post]), "Admin Post was successfully created.")
+          expect(assigns[:admin_post].posted?).to be_falsey
         end
       end
     end
 
-    context "when admin has correct authorization" do
-      authorized_roles.each do |admin_role|
-        context "with #{admin_role} role" do
-          before { fake_login_admin(create(:admin, roles: [admin_role])) }
-
-          context "when admin post is valid" do
-            it "redirects to post with notice" do
-              post :create, params: { admin_post: base_params }
-              it_redirects_to_with_notice(admin_post_path(assigns[:admin_post]), "Admin Post was successfully created.")
-            end
-          end
+    context "when admin post is invalid" do
+      let(:admin) { create(:superadmin) }
+      before { fake_login_admin(admin) }
 
-          context "when admin post is invalid" do
-            context "with invalid translated post id" do
-              it "renders the new template with error message" do
-                post :create, params: { admin_post: { translated_post_id: 0 } }.merge(base_params)
+      context "with invalid translated post id" do
+        let(:params) { super().deep_merge(admin_post: { translated_post_id: 0, language_id: create(:language).id }) }
 
-                expect(response).to render_template(:new)
-                expect(assigns[:admin_post].errors.full_messages).to include("Translated post does not exist")
-              end
+        it "renders the new template with error message" do
+          subject
 
-              it "doesn't create new tags" do
-                post :create, params: { admin_post: { translated_post_id: 0, tag_list: "badtag" } }.merge(base_params)
-                expect(AdminPostTag.find_by(name: "badtag")).to be_nil
-              end
-            end
+          expect(response).to render_template(:new)
+          expect(assigns[:admin_post].errors.full_messages).to include("Translated post does not exist")
+        end
 
-            context "with invalid comment permissions" do
-              it "renders the new template with error message" do
-                post :create, params: { admin_post: { comment_permissions: "Comment" } }.merge(base_params)
+        context "with new tags" do
+          let(:params) { super().deep_merge(admin_post: { tag_list: "badtag" }) }
+          it "doesn't create new tags" do
+            subject
 
-                expect(response).to render_template(:new)
-                expect(assigns[:admin_post].errors.full_messages).to include("Comment permissions are invalid.")
-              end
-            end
+            expect(AdminPostTag.find_by(name: "badtag")).to be_nil
           end
+        end
+      end
 
-          context "when translated post has same language id" do
-            let(:admin_post) { create(:admin_post) }
+      context "with invalid comment permissions" do
+        it "renders the new template with error message" do
+          post :create, params: params.deep_merge(admin_post: { comment_permissions: "Comment" })
 
-            it "renders the new template with error message" do
-              post :create, params: { admin_post: { translated_post_id: admin_post.id, language_id: admin_post.language_id } }.merge(base_params)
+          expect(response).to render_template(:new)
+          expect(assigns[:admin_post].errors.full_messages).to include("Comment permissions are invalid.")
+        end
+      end
 
-              expect(response).to render_template(:new)
-              expect(assigns[:admin_post].errors.full_messages).to include("Translated post cannot be same language as original post")
-            end
-          end
+      context "when translated post has same language id" do
+        let(:admin_post) { create(:admin_post) }
+        let(:params) { super().deep_merge(admin_post: { translated_post_id: admin_post.id, language_id: admin_post.language_id }) }
+
+        it "renders the new template with error message" do
+          subject
+
+          expect(response).to render_template(:new)
+          expect(assigns[:admin_post].errors.full_messages).to include("Translated post cannot be same language as original post")
         end
       end
     end
   end
 
   describe "POST #update" do
-    let(:admin) { create(:admin) }
-    let(:post) { create(:admin_post) }
+    let(:admin_post) { create(:admin_post) }
+    let(:post_params) { { title: "AdminPost Title", content: "Cool new admin post content" } }
+    let(:params) { { id: admin_post.id, admin_post: post_params } }
+    subject { put :update, params: params }
+    let(:success) do
+      it_redirects_to_with_notice(admin_post_path(assigns[:admin_post]), "Admin Post was successfully updated.")
+      expect(admin_post.reload.content).to include(params[:admin_post][:content])
+    end
 
-    authorized_roles = %w[superadmin board board_assistants_team communications support translation]
-    unauthorized_roles = Admin::VALID_ROLES - authorized_roles
+    context "when admin post is valid" do
+      context "when the post is a draft" do
+        let(:admin_post) { create(:admin_post, :draft) }
+        let(:params) { super().merge(save_button: "Save As Draft") }
+        let(:success) do
+          super()
+          expect(assigns[:admin_post].draft?).to be_truthy
+        end
 
-    context "when admin does not have correct authorization" do
-      unauthorized_roles.each do |admin_role|
-        context "with the role #{admin_role}" do
-          it "redirects with error" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            put :update, params: { id: post.id, admin_post: { admin_id: admin.id } }
+        it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+        it_behaves_like "an action that non-admins cannot access"
+      end
 
-            it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
-          end
+      context "when posting a draft" do
+        let(:admin_post) { create(:admin_post, :draft) }
+        let(:params) { super().merge(post_button: "Post") }
+        let(:success) do
+          super()
+          expect(admin_post.reload.draft?).to be_falsey
         end
+
+        it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+        it_behaves_like "an action that non-admins cannot access"
       end
 
-      context "with no role" do
-        it "redirects with error" do
-          admin.update!(roles: [])
-          fake_login_admin(admin)
-          put :update, params: { id: post.id, admin_post: { admin_id: admin.id } }
+      context "when the post is not a draft" do
+        let(:params) { super().merge(post_button: "Update") }
+
+        it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+        it_behaves_like "an action that non-admins cannot access"
+      end
 
-          it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
+      context "when the post is previewed" do
+        let(:params) { super().merge(preview_button: "Preview") }
+        let(:success) do
+          expect(response).to render_template(:preview)
+          expect(admin_post.reload.content).to_not include(params[:admin_post][:content])
         end
+
+        it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+        it_behaves_like "an action that non-admins cannot access"
+      end
+    end
+
+    context "with valid title" do
+      let(:post_params) { super().merge(title: "Modified Title of Post") }
+      let(:success) do
+        super()
+        expect(assigns[:admin_post].title).to eq("Modified Title of Post")
       end
+
+      it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+      it_behaves_like "an action that non-admins cannot access"
     end
 
     context "when admin has correct authorization" do
-      authorized_roles.each do |admin_role|
+      posting_roles.each do |admin_role|
         context "with #{admin_role} role" do
-          context "with valid title" do
-            it "updates title and redirects with notice" do
-              admin.update!(roles: [admin_role])
-              fake_login_admin(admin)
-              put :update, params: { id: post.id, admin_post: { admin_id: admin.id, title: "Modified Title of Post" } }
-
-              expect(post.reload.title).to eq("Modified Title of Post")
-              it_redirects_to_with_notice(admin_post_path(assigns[:admin_post]), "Admin Post was successfully updated.")
-            end
-          end
+          let(:admin) { create(:admin, roles: [admin_role]) }
 
+          before { fake_login_admin(admin) }
+          
           context "with invalid translated_post_id" do
             it "renders the edit template with error message" do
-              admin.update!(roles: [admin_role])
-              fake_login_admin(admin)
-              put :update, params: { id: post.id, admin_post: { admin_id: admin.id, translated_post_id: 0 } }
+              put :update, params: { id: admin_post.id, admin_post: { admin_id: admin.id, translated_post_id: 0 } }
 
               expect(response).to render_template(:edit)
               expect(assigns[:admin_post].errors.full_messages).to include("Translated post does not exist")
@@ -172,12 +279,10 @@
           end
 
           context "with valid translated_post_id" do
-            let!(:translation) { create(:admin_post, translated_post_id: post.id, language_id: create(:language).id) }
+            let!(:translation) { create(:admin_post, translated_post_id: admin_post.id, language_id: create(:language).id) }
 
             context "with valid comment_permissions" do
               it "does not change comment_permissions and redirects with notice" do
-                admin.update!(roles: [admin_role])
-                fake_login_admin(admin)
                 expect do
                   put :update, params: {
                     id: translation.id,
@@ -188,19 +293,31 @@
                   }
                 end.not_to change { AdminPost.comment_permissions }
 
-                expect(translation.reload.comment_permissions).to eq(post.comment_permissions)
+                expect(translation.reload.comment_permissions).to eq(admin_post.comment_permissions)
                 it_redirects_to_with_notice(admin_post_path(translation), "Admin Post was successfully updated.")
               end
             end
 
             context "with invalid translated_post language" do
-              it "renders the edit template with error message" do 
-                admin.update!(roles: [admin_role])
-                fake_login_admin(admin)
-                put :update, params: { id: translation.id, admin_post: { language_id:post.language_id } }
+              it "renders the edit template with error message" do
+                put :update, params: { id: translation.id, admin_post: { admin_id: admin.id, language_id: admin_post.language_id } }
                 expect(response).to render_template(:edit)
                 expect(assigns[:admin_post].errors.full_messages).to include("Translated post cannot be same language as original post")
-              end 
+              end
+            end
+
+            context "when posting" do
+              context "an unposted translated post" do
+                let(:admin_post) { create(:admin_post, :draft) }
+                let(:translation) { create(:admin_post, :draft, translated_post_id: admin_post.id, language_id: create(:language).id) }
+  
+                it "will remain a draft" do
+                  put :update, params: { post_button: "Post", id: translation.id, admin_post: { admin_id: admin.id } }
+  
+                  it_redirects_to_with_notice(admin_post_path(assigns[:admin_post]), "Admin Post was successfully updated.")
+                  expect(translation.reload.posted?).to be_falsey
+                end
+              end
             end
           end
         end
@@ -208,152 +325,65 @@
     end
   end
 
-  describe "GET #edit" do
-    let(:admin) { create(:admin) }
-    let(:post) { create(:admin_post) }
-    authorized_roles = %w[superadmin board board_assistants_team communications support translation]
-    unauthorized_roles = Admin::VALID_ROLES - authorized_roles
-
-    context "when admin does not have correct authorization" do
-      unauthorized_roles.each do |admin_role|
-        context "with the role #{admin_role}" do
-          it "redirects with error" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            get :edit, params: { id: post.id }
-
-            it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
-          end
-        end
-      end
-
-      context "with no role" do
-        it "redirects with error" do
-          admin.update!(roles: [])
-          fake_login_admin(admin)
-          get :edit, params: { id: post.id }
-
-          it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
-        end
-      end
+  describe "POST #post" do
+    let(:admin_post) { create(:admin_post, :draft) }
+    subject { put :post, params: { id: admin_post.id } }
+    let(:success) do
+      it_redirects_to_with_notice(admin_post_path(admin_post), "Admin Post was successfully posted.")
+      expect(admin_post.reload.posted).to be_truthy
     end
 
-    context "when admin has correct authorization" do
-      authorized_roles.each do |admin_role|
-        context "with #{admin_role} role" do
-          it "renders edit template" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            get :edit, params: { id: post.id }
-
-            expect(response).to render_template(:edit)
-          end
-        end
-      end
-    end
+    it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+    it_behaves_like "an action that non-admins cannot access"
   end
 
-  describe "GET #new" do
-    let(:admin) { create(:admin) }
-    let(:post) { create(:admin_post) }
-    authorized_roles = %w[superadmin board board_assistants_team communications support translation]
-    unauthorized_roles = Admin::VALID_ROLES - authorized_roles
-
-    context "when admin does not have correct authorization" do
-      unauthorized_roles.each do |admin_role|
-        context "with the role #{admin_role}" do
-          it "redirects with error" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            get :edit, params: { id: post.id }
-
-            it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
-          end
-        end
-      end
-
-      context "with no role" do
-        it "redirects with error" do
-          admin.update!(roles: [])
-          fake_login_admin(admin)
-          get :edit, params: { id: post.id }
+  describe "DELETE #destroy" do
+    subject { delete :destroy, params: { id: admin_post.id } }
 
-          it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
-        end
+    context "when post is a draft" do
+      let(:admin_post) { create(:admin_post, :draft) }
+      let(:success) do
+        expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+        it_redirects_to(drafts_admin_posts_path)
       end
-    end
 
-    context "when admin has correct authorization" do
-      authorized_roles.each do |admin_role|
-        context "with #{admin_role} role" do
-          it "renders new template" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            get :new, params: { id: post.id }
+      it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+      it_behaves_like "an action that non-admins cannot access"
 
-            expect(response).to render_template(:new)
-          end
+      context "with translated post" do
+        let!(:translation) { create(:admin_post, :draft, translated_post_id: admin_post.id, language_id: create(:language).id) }
+        let(:success) do
+          expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+          expect { translation.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+          it_redirects_to(drafts_admin_posts_path)
         end
+
+        it_behaves_like "an action only authorized admins can access", authorized_roles: drafting_roles
+        it_behaves_like "an action that non-admins cannot access"
       end
     end
-  end
 
-  describe "DELETE #destroy" do
-    let(:admin) { create(:admin) }
-    let(:post) { create(:admin_post) }
-    authorized_roles = %w[superadmin board board_assistants_team communications support translation]
-    unauthorized_roles = Admin::VALID_ROLES - authorized_roles
-
-    context "when admin does not have correct authorization" do
-      unauthorized_roles.each do |admin_role|
-        context "with the role #{admin_role}" do
-          it "redirects with error" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            delete :destroy, params: { id: post.id }
-
-            it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
-          end
-        end
+    context "when post is not a draft" do
+      let(:admin_post) { create(:admin_post) }
+      let(:success) do
+        expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+        it_redirects_to(admin_posts_path)
       end
 
-      context "with no role" do
-        it "redirects with error" do
-          admin.update!(roles: [])
-          fake_login_admin(admin)
-          delete :destroy, params: { id: post.id }
-
-          it_redirects_to_with_error(root_url, "Sorry, only an authorized admin can access the page you were trying to reach.")
+      context "with translated post" do
+        let!(:translation) { create(:admin_post, translated_post_id: admin_post.id, language_id: create(:language).id) }
+        let(:success) do
+          expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+          expect { translation.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+          it_redirects_to(admin_posts_path)
         end
-      end
-    end
 
-    context "when admin has correct authorization" do
-      authorized_roles.each do |admin_role|
-        context "with #{admin_role} role" do
-          it "deletes post and redirects without notice" do
-            admin.update!(roles: [admin_role])
-            fake_login_admin(admin)
-            delete :destroy, params: { id: post.id }
-
-            expect { post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-            it_redirects_to(admin_posts_path)
-          end
-          
-          context "with translated post" do
-            let!(:translation) { create(:admin_post, translated_post_id: post.id, language_id: create(:language).id) }
-
-            it "deletes translations of post along with post" do 
-              admin.update!(roles: [admin_role])
-              fake_login_admin(admin)
-              delete :destroy, params: { id: post.id }
-  
-              expect { post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-              expect { translation.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-            end
-          end
-        end
+        it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+        it_behaves_like "an action that non-admins cannot access"
       end
+
+      it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
+      it_behaves_like "an action that non-admins cannot access"
     end
   end
 end
diff --git a/spec/helpers/admin_post_helper_spec.rb b/spec/helpers/admin_post_helper_spec.rb
index 279a2597ce0..7863ac62ee1 100644
--- a/spec/helpers/admin_post_helper_spec.rb
+++ b/spec/helpers/admin_post_helper_spec.rb
@@ -1,19 +1,42 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe AdminPostHelper do
-  describe '#sorted_translations' do
-    it 'returns translations sorted alphabetically by language' do
-      english = Language.find_by(short: 'en', sortable_name: '')
-      german = Language.create(name: 'Deutsch', short: 'de', sortable_name: '')
-      finnish = Language.create(name: 'Suomi', short: 'fi', sortable_name: 'su')
-      indonesian = Language.create(name: 'Bahasa Indonesia', short: 'id', sortable_name: 'ba')
-
-      english_post = create(:admin_post, language: english)
+  describe "#sorted_translations" do
+    let(:english) { Language.find_by(short: "en", sortable_name: "") }
+    let(:german) { create(:language, name: "Deutsch", short: "de", sortable_name: "") }
+    let(:finnish) { create(:language, name: "Suomi", short: "fi", sortable_name: "su") }
+    let(:indonesian) { create(:language, name: "Bahasa Indonesia", short: "id", sortable_name: "ba") }
+
+    let(:english_post) { create(:admin_post, language: english) }
+
+    it "returns translations sorted alphabetically by language" do
       german_post = create(:admin_post, language: german, translated_post: english_post)
       finnish_post = create(:admin_post, language: finnish, translated_post: english_post)
       indonesian_post = create(:admin_post, language: indonesian, translated_post: english_post)
 
       expect(sorted_translations(english_post.reload)).to eq([indonesian_post, german_post, finnish_post])
     end
+
+    context "when the news is posted" do
+      it "does not include draft translations" do
+        _german_post = create(:admin_post, :draft, language: german, translated_post: english_post)
+        finnish_post = create(:admin_post, language: finnish, translated_post: english_post)
+        _indonesian_post = create(:admin_post, :draft, language: indonesian, translated_post: english_post)
+
+        expect(sorted_translations(english_post.reload)).to eq([finnish_post])
+      end
+    end
+
+    context "when the news is a draft" do
+      let(:english_post) { create(:admin_post, :draft, language: english) }
+
+      it "includes draft translations" do
+        german_post = create(:admin_post, :draft, language: german, translated_post: english_post)
+        finnish_post = create(:admin_post, :draft, language: finnish, translated_post: english_post)
+        indonesian_post = create(:admin_post, :draft, language: indonesian, translated_post: english_post)
+
+        expect(sorted_translations(english_post.reload)).to eq([indonesian_post, german_post, finnish_post])
+      end
+    end
   end
 end
diff --git a/spec/models/admin_post_spec.rb b/spec/models/admin_post_spec.rb
index 64eaf26c292..d7bf8f2aa07 100644
--- a/spec/models/admin_post_spec.rb
+++ b/spec/models/admin_post_spec.rb
@@ -46,4 +46,30 @@
       expect(new_post.reload.disable_all_comments?).to be(false)
     end
   end
+
+  describe "#set_published_at" do
+    before { freeze_time }
+
+    let(:admin_post) { create(:admin_post, :draft) }
+
+    it "sets the publication date to now" do
+      admin_post.update!(posted: true)
+      expect(admin_post.published_at).to eq(Time.current)
+    end
+    
+    it "keeps existing publication dates" do
+      admin_post.update!(posted: true, published_at: 1.day.ago)
+      expect(admin_post.published_at).to eq(1.day.ago)
+    end
+  end
+
+  describe "#post_translations" do
+    let(:admin_post) { create(:admin_post, :draft) }
+    let!(:translation) { create(:admin_post, :draft, translated_post_id: admin_post.id, language_id: create(:language).id) }
+
+    it "posts draft translations" do
+      admin_post.reload.update!(posted: true)
+      expect(translation.reload.posted?).to be_truthy
+    end
+  end
 end
diff --git a/spec/support/shared_examples/access_shared_examples.rb b/spec/support/shared_examples/access_shared_examples.rb
index b721c58a97f..e53f32a637b 100644
--- a/spec/support/shared_examples/access_shared_examples.rb
+++ b/spec/support/shared_examples/access_shared_examples.rb
@@ -33,6 +33,26 @@
   end
 end
 
+shared_examples "an action that non-admins cannot access" do
+  context "as a registered user" do
+    let(:user) { create(:user) }
+
+    it "redirects with an error" do
+      fake_login_known_user(user)
+      subject
+      it_redirects_to_simple(root_path)
+    end
+  end
+
+  context "as a guest" do
+    it "redirects with an error" do
+      fake_logout
+      subject
+      it_redirects_to_simple(root_path)
+    end
+  end
+end
+
 shared_examples "denies access for work that isn't visible to user" do
   shared_examples "denies access to random user" do
     it "allows access for work creator" do

From 4f509e971cfddbcb8bdf2151ba1e6d3f9c75bf2e Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Fri, 22 May 2026 22:37:56 -0700
Subject: [PATCH 02/12] AO3-6960 Dog and lint

---
 app/controllers/admin_posts_controller.rb     |  1 -
 app/models/admin_post.rb                      |  2 +-
 app/views/admin_posts/_admin_index.html.erb   |  8 +++----
 app/views/admin_posts/_admin_post.html.erb    |  2 +-
 .../admin_posts/_admin_post_blurb.html.erb    | 14 +++++------
 .../admin_posts/_posting_fieldset.html.erb    |  2 +-
 app/views/admin_posts/drafts.html.erb         |  8 +++----
 app/views/admin_posts/index.rss.builder       |  3 +--
 app/views/admin_posts/show.html.erb           |  2 +-
 app/views/home/_news_module.html.erb          |  2 +-
 config/locales/controllers/en.yml             | 11 +++++++++
 config/locales/views/en.yml                   | 11 +++++++++
 .../admin_posts_controller_spec.rb            | 24 ++++++++++++++-----
 13 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/app/controllers/admin_posts_controller.rb b/app/controllers/admin_posts_controller.rb
index 68911673b2a..36564476e22 100644
--- a/app/controllers/admin_posts_controller.rb
+++ b/app/controllers/admin_posts_controller.rb
@@ -1,5 +1,4 @@
 class AdminPostsController < Admin::BaseController
-
   before_action :admin_only, except: [:index, :show]
   before_action :load_languages, except: [:show, :destroy]
   before_action :load_admin_posts, only: [:index, :drafts]
diff --git a/app/models/admin_post.rb b/app/models/admin_post.rb
index 0af1629d0c2..c09a1f752d0 100644
--- a/app/models/admin_post.rb
+++ b/app/models/admin_post.rb
@@ -43,9 +43,9 @@ class AdminPost < ApplicationRecord
 
   before_save :inherit_translated_post_comment_permissions, :inherit_translated_post_tags
   before_save :set_published_at, if: :posted_changed?
+  after_destroy :expire_cached_home_admin_posts
   after_save :expire_cached_home_admin_posts, :update_translation_comment_permissions, :update_translation_tags
   after_save :post_translations, if: :saved_change_to_posted?
-  after_destroy :expire_cached_home_admin_posts
 
   # Return the name to link comments to for this object
   def commentable_name
diff --git a/app/views/admin_posts/_admin_index.html.erb b/app/views/admin_posts/_admin_index.html.erb
index 5e70ca97e48..5514679856d 100644
--- a/app/views/admin_posts/_admin_index.html.erb
+++ b/app/views/admin_posts/_admin_index.html.erb
@@ -1,5 +1,5 @@
 <!--Descriptive page name, messages and instructions-->
-<h2 class="heading"><%= ts("AO3 News") %></h2>
+<h2 class="heading"><%= t(".page_heading") %></h2>
 <!--/descriptions-->
 <!--subnav-->
 <%= render 'filters' %>
@@ -7,11 +7,11 @@
 <!--/subnav-->
 
 <!--main content-->
-<h3 class="landmark heading"><%= ts("Manage News Postings") %></h3>
+<h3 class="landmark heading"><%= t(".landmark") %></h3>
 <dl class="news index group">
-	<%= render partial: "admin_post_blurb", collection: @admin_posts, as: :admin_post %>
+  <%= render partial: "admin_post_blurb", collection: @admin_posts, as: :admin_post %>
 </dl>
 <!--/content-->
 <!--subnav-->
-  <%= will_paginate @admin_posts %>
+<%= will_paginate @admin_posts %>
 <!--/subnav-->
diff --git a/app/views/admin_posts/_admin_post.html.erb b/app/views/admin_posts/_admin_post.html.erb
index 3651a201257..9160616d0ab 100644
--- a/app/views/admin_posts/_admin_post.html.erb
+++ b/app/views/admin_posts/_admin_post.html.erb
@@ -8,7 +8,7 @@
 <div class="wrapper">
   <dl class="meta">
     <% if admin_post.posted? %>
-      <dt class="published"><%= ts("Published:") %></dt>
+      <dt class="published"><%= t(".published") %></dt>
       <dd class="published"><%= admin_post.published_at %></dd>
     <% end %>
     <% if admin_post.translated_post %>
diff --git a/app/views/admin_posts/_admin_post_blurb.html.erb b/app/views/admin_posts/_admin_post_blurb.html.erb
index 3be142ac27d..396c3886c1e 100644
--- a/app/views/admin_posts/_admin_post_blurb.html.erb
+++ b/app/views/admin_posts/_admin_post_blurb.html.erb
@@ -3,22 +3,22 @@
 <dd>
   <p class="datetime">
     <% if admin_post.posted? %>
-      <%= ts("Published at %{publication_date} (Created at %{created_date} and updated at %{updated_date})", publication_date: admin_post.published_at, created_date: admin_post.created_at, updated_date: admin_post.updated_at) %>
+      <%= t(".meta.published", publication_date: admin_post.published_at, created_date: admin_post.created_at, updated_date: admin_post.updated_at) %>
     <% else %>
-      <%= ts("Created at %{created_date} and updated at %{updated_date}", created_date: admin_post.created_at, updated_date: admin_post.updated_at) %>
+      <%= t(".meta.draft", created_date: admin_post.created_at, updated_date: admin_post.updated_at) %>
     <% end %>
   </p>
   <ul class="actions">
-    <li><%= link_to ts("Show"), admin_post %></li>
+    <li><%= link_to t(".show"), admin_post %></li>
     <% if policy(admin_post).edit? %>
-      <li><%= link_to ts("Edit"), edit_admin_post_path(admin_post) %></li>
+      <li><%= link_to t(".edit"), edit_admin_post_path(admin_post) %></li>
       <% if admin_post.posted %>
-        <li><%= link_to ts("Delete"), admin_post, data: { confirm: ts("Are you sure?") }, method: :delete %></li>
+        <li><%= link_to t(".delete"), admin_post, data: { confirm: t(".confirm_delete") }, method: :delete %></li>
       <% else %>
         <% if policy(AdminPost).can_post? && (admin_post.translated_post.blank? || admin_post.translated_post.posted?) %>
-          <li><%= link_to ts("Post Draft"), post_admin_post_path(admin_post), method: :put %></li>
+          <li><%= link_to t(".draft.post"), post_admin_post_path(admin_post), method: :put %></li>
         <% end %>
-        <li><%= link_to ts("Delete Draft"), admin_post, data: { confirm: ts("Are you sure?") }, method: :delete %></li>
+        <li><%= link_to t(".draft.delete"), admin_post, data: { confirm: t(".confirm_delete") }, method: :delete %></li>
       <% end %>
     <% end %>
   </ul>
diff --git a/app/views/admin_posts/_posting_fieldset.html.erb b/app/views/admin_posts/_posting_fieldset.html.erb
index 49015d805f6..a6f9181968c 100644
--- a/app/views/admin_posts/_posting_fieldset.html.erb
+++ b/app/views/admin_posts/_posting_fieldset.html.erb
@@ -8,7 +8,7 @@
     <% end %>
 
     <% if @preview_mode %>
-      <li><%= submit_tag t(".actions.edit"), name: "edit_button" %>
+      <li><%= form.submit t(".actions.edit"), name: "edit_button" %>
     <% else %>
       <li><%= form.submit t(".actions.preview"), name: "preview_button" %></li>
     <% end %>
diff --git a/app/views/admin_posts/drafts.html.erb b/app/views/admin_posts/drafts.html.erb
index a520a03c7d8..b6dc98ac1b7 100644
--- a/app/views/admin_posts/drafts.html.erb
+++ b/app/views/admin_posts/drafts.html.erb
@@ -1,6 +1,6 @@
 <div class="news admin home">
   <!--Descriptive page name, messages and instructions-->
-  <h2 class="heading"><%= ts("AO3 News Drafts") %></h2>
+  <h2 class="heading"><%= t(".page_heading") %></h2>
   <!--/descriptions-->
   <!--subnav-->
   <%= render "filters" %>
@@ -8,11 +8,9 @@
   <!--/subnav-->
 
   <!--main content-->
-  <h3 class="landmark heading"><%= ts("Manage News Drafts") %></h3>
+  <h3 class="landmark heading"><%= t(".landmark") %></h3>
   <dl class="news index group">
-    <% @admin_posts.each do |admin_post| %>
-      <%= render "admin_post_blurb", admin_post: admin_post %>
-    <% end %>
+    <%= render partial: "admin_post_blurb", collection: @admin_posts, as: :admin_post %>
   </dl>
   <!--/content-->
   <!--subnav-->
diff --git a/app/views/admin_posts/index.rss.builder b/app/views/admin_posts/index.rss.builder
index 70843f42c9b..523fb7fd1da 100644
--- a/app/views/admin_posts/index.rss.builder
+++ b/app/views/admin_posts/index.rss.builder
@@ -4,7 +4,7 @@ xml.rss :version => "2.0" do
     xml.title "AO3 News"
     xml.description "Latest updates from archiveofourown.org"
     xml.link admin_posts_url
-    
+
     @admin_posts.each do |post|
       xml.item do
         xml.title post.title
@@ -16,4 +16,3 @@ xml.rss :version => "2.0" do
     end
   end
 end
-
diff --git a/app/views/admin_posts/show.html.erb b/app/views/admin_posts/show.html.erb
index fd1d59254a0..d32afb0745b 100755
--- a/app/views/admin_posts/show.html.erb
+++ b/app/views/admin_posts/show.html.erb
@@ -1,4 +1,4 @@
-<div class="news admin<%= ' draft' if @preview_mode || @admin_post.draft? %> home">
+<div class="news admin<%= " draft" if @preview_mode || @admin_post.draft? %> home">
   <div class="primary header module">
     <!--Descriptive page name, messages and instructions-->
     <h2 class="heading">
diff --git a/app/views/home/_news_module.html.erb b/app/views/home/_news_module.html.erb
index c6d5a3d84fc..abb0b7f332c 100644
--- a/app/views/home/_news_module.html.erb
+++ b/app/views/home/_news_module.html.erb
@@ -13,7 +13,7 @@
           </h4>
           <p class="meta">
             <span class="published">
-              <%= ts('Published:') %> <%= time_in_zone(admin_post.published_at) %>
+              <%= t(".news.published_html", publication_date: time_in_zone(admin_post.published_at)) %>
             </span>
             <span class="comments">
               <%= ts('Comments:') %> <%= link_to(admin_post.count_visible_comments, polymorphic_path(admin_post, show_comments: true, anchor: :comments)) %>
diff --git a/config/locales/controllers/en.yml b/config/locales/controllers/en.yml
index 02c8ab96eb3..c5138643e50 100644
--- a/config/locales/controllers/en.yml
+++ b/config/locales/controllers/en.yml
@@ -79,6 +79,17 @@ en:
           one: Successfully removed pseud %{pseuds} from this work.
           other: Successfully removed pseuds %{pseuds} from this work.
   admin_posts:
+    admin_post_blurb:
+      confirm_delete: Are you sure?
+      delete: Delete
+      draft:
+        delete: Delete Draft
+        post: Post Draft
+      edit: Edit
+      meta:
+        draft: Created at %{created_date} and updated at %{updated_date}
+        published: Published at %{publication_date} (Created at %{created_date} and updated at %{updated_date})
+      show: Show
     create:
       success: Admin Post was successfully created.
     post:
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 43d3fa7fb5c..6917fc0bfce 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -514,6 +514,12 @@ en:
         submit_multiple: Remove Pseuds
         submit_one: Yes, Remove Pseud
   admin_posts:
+    admin_index:
+      landmark: Manage News Postings
+      page_heading: AO3 News
+    admin_post:
+      original: 'Original:'
+      published: 'Published:'
     admin_post_form:
       comment_permissions:
         label: Who can comment on this news post
@@ -526,6 +532,8 @@ en:
         footnote_tags: Tags from the selected post will replace any tags entered on this page.
         label: Translation of
     drafts:
+      landmark: Manage News Drafts
+      page_heading: AO3 News Drafts
       page_title: AO3 News Drafts
     index:
       page_title: AO3 News
@@ -1917,6 +1925,9 @@ en:
       intro_description: A non-profit, non-commercial archive for transformative fanworks; created by and for fans of books, music, art, games, shows, movies, real-person fiction (RPF), and other fandoms.
       parent_org: Organization for Transformative Works
       parent_org_intro_html: The Archive of Our Own (AO3) is a project of the %{parent_org_link}.
+    news_module:
+      news:
+        published_html: 'Published: %{publication_date}'
     privacy:
       account_termination:
         backup_copies_html: '"Active records" do not include the backup copies of Content created for legal and/or disaster recovery purposes (refer to the %{general_principles_link}).'
diff --git a/spec/controllers/admin_posts_controller_spec.rb b/spec/controllers/admin_posts_controller_spec.rb
index c5f6d531754..72f610a4c5a 100644
--- a/spec/controllers/admin_posts_controller_spec.rb
+++ b/spec/controllers/admin_posts_controller_spec.rb
@@ -343,7 +343,9 @@
     context "when post is a draft" do
       let(:admin_post) { create(:admin_post, :draft) }
       let(:success) do
-        expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+        expect do
+          admin_post.reload
+        end.to raise_exception(ActiveRecord::RecordNotFound)
         it_redirects_to(drafts_admin_posts_path)
       end
 
@@ -353,8 +355,12 @@
       context "with translated post" do
         let!(:translation) { create(:admin_post, :draft, translated_post_id: admin_post.id, language_id: create(:language).id) }
         let(:success) do
-          expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-          expect { translation.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+          expect do
+            admin_post.reload
+          end.to raise_exception(ActiveRecord::RecordNotFound)
+          expect do
+            translation.reload
+          end.to raise_exception(ActiveRecord::RecordNotFound)
           it_redirects_to(drafts_admin_posts_path)
         end
 
@@ -366,15 +372,21 @@
     context "when post is not a draft" do
       let(:admin_post) { create(:admin_post) }
       let(:success) do
-        expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+        expect do
+          admin_post.reload
+        end.to raise_exception(ActiveRecord::RecordNotFound)
         it_redirects_to(admin_posts_path)
       end
 
       context "with translated post" do
         let!(:translation) { create(:admin_post, translated_post_id: admin_post.id, language_id: create(:language).id) }
         let(:success) do
-          expect { admin_post.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-          expect { translation.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+          expect do
+            admin_post.reload
+          end.to raise_exception(ActiveRecord::RecordNotFound)
+          expect do
+            translation.reload
+          end.to raise_exception(ActiveRecord::RecordNotFound)
           it_redirects_to(admin_posts_path)
         end
 

From f64b903530d30b812695127d4e70634eb33cc6b2 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sat, 23 May 2026 07:14:50 -0700
Subject: [PATCH 03/12] AO3-6960 Remove unused i18n key

---
 config/locales/views/en.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 6917fc0bfce..649139acc0c 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -518,7 +518,6 @@ en:
       landmark: Manage News Postings
       page_heading: AO3 News
     admin_post:
-      original: 'Original:'
       published: 'Published:'
     admin_post_form:
       comment_permissions:

From 812df7c3b2f5b4ee9d5dccfc3fbacd22bf419505 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 24 May 2026 16:47:44 -0700
Subject: [PATCH 04/12] AO3-6960 Check validity before previewing new admin
 posts

---
 app/controllers/admin_posts_controller.rb      | 18 ++++++++++--------
 .../controllers/admin_posts_controller_spec.rb | 11 +++++++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin_posts_controller.rb b/app/controllers/admin_posts_controller.rb
index 36564476e22..24cd8864ec1 100644
--- a/app/controllers/admin_posts_controller.rb
+++ b/app/controllers/admin_posts_controller.rb
@@ -65,15 +65,17 @@ def create
     @admin_post.posted = true if params[:post_button] && !@admin_post&.translated_post&.draft?
 
     authorize @admin_post
-    if params[:preview_button]
-      @preview_mode = true
-      render action: "preview"
-    elsif !params[:edit_button] && @admin_post.save
-      flash[:notice] = t(".success")
-      redirect_to(admin_post_path(@admin_post))
-    else
-      render action: "new"
+    if !params[:edit_button] && @admin_post.valid?
+      if params[:preview_button]
+        @preview_mode = true
+        render action: "preview" and return
+      elsif !params[:edit_button] && @admin_post.save
+        flash[:notice] = t(".success")
+        redirect_to(admin_post_path(@admin_post)) and return
+      end
     end
+
+    render action: "new"
   end
 
   # PUT /admin_posts/1
diff --git a/spec/controllers/admin_posts_controller_spec.rb b/spec/controllers/admin_posts_controller_spec.rb
index 72f610a4c5a..fa9d94f1d2a 100644
--- a/spec/controllers/admin_posts_controller_spec.rb
+++ b/spec/controllers/admin_posts_controller_spec.rb
@@ -172,6 +172,17 @@
             expect(AdminPostTag.find_by(name: "badtag")).to be_nil
           end
         end
+
+        context "when the post is previewed" do
+          let(:params) { super().merge(preview_button: "Preview") }
+
+          it "renders the new template with error message" do
+            subject
+
+            expect(response).to render_template(:new)
+            expect(assigns[:admin_post].errors.full_messages).to include("Translated post does not exist")
+          end
+        end
       end
 
       context "with invalid comment permissions" do

From f568aaf5ae4a8b9a7477288981733019af111ce0 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 24 May 2026 16:48:31 -0700
Subject: [PATCH 05/12] AO3-6960 Use pagy on the normal index

---
 app/controllers/admin_posts_controller.rb   | 2 +-
 app/views/admin_posts/_admin_index.html.erb | 2 +-
 app/views/admin_posts/index.html.erb        | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin_posts_controller.rb b/app/controllers/admin_posts_controller.rb
index 24cd8864ec1..092b876a56e 100644
--- a/app/controllers/admin_posts_controller.rb
+++ b/app/controllers/admin_posts_controller.rb
@@ -6,7 +6,7 @@ class AdminPostsController < Admin::BaseController
   # GET /admin_posts
   def index
     @page_subtitle = t(".page_title")
-    @admin_posts = @admin_posts.posted.order(published_at: :desc).page(params[:page])
+    @pagy, @admin_posts = pagy(@admin_posts.posted.order(published_at: :desc))
   end
 
   # GET /admin_posts/drafts
diff --git a/app/views/admin_posts/_admin_index.html.erb b/app/views/admin_posts/_admin_index.html.erb
index 5514679856d..fa7da193f2c 100644
--- a/app/views/admin_posts/_admin_index.html.erb
+++ b/app/views/admin_posts/_admin_index.html.erb
@@ -13,5 +13,5 @@
 </dl>
 <!--/content-->
 <!--subnav-->
-<%= will_paginate @admin_posts %>
+<%== pagy_nav @pagy %>
 <!--/subnav-->
diff --git a/app/views/admin_posts/index.html.erb b/app/views/admin_posts/index.html.erb
index 6a3978bfa1b..806895b9b1e 100755
--- a/app/views/admin_posts/index.html.erb
+++ b/app/views/admin_posts/index.html.erb
@@ -17,7 +17,6 @@
     </div>
     <!--main content-->
     <% @admin_posts.each do |admin_post| %>
-
       <div class="news module group" role="article">
         <%= render "admin_post", admin_post: admin_post %>
         <!-- BEGIN comment section -->
@@ -37,7 +36,7 @@
     <hr class="clear" />
 
     <!--subnav-->
-    <%= will_paginate @admin_posts %>
+    <%== pagy_nav @pagy %>
     <!--/subnav-->
   <% end %>
 </div>

From 51e464f7af7c2585c2ecb1268c605e02c4a47c90 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 24 May 2026 16:50:58 -0700
Subject: [PATCH 06/12] AO3-6960 Add admin permission check for draft news link
 in nav

---
 app/views/admin/_admin_nav.html.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/_admin_nav.html.erb b/app/views/admin/_admin_nav.html.erb
index 59d920ce235..7475c61cc40 100644
--- a/app/views/admin/_admin_nav.html.erb
+++ b/app/views/admin/_admin_nav.html.erb
@@ -3,9 +3,11 @@
   <li>
     <%= span_if_current t(".ao3_news"), admin_posts_path %>
   </li>
-  <li>
-    <%= span_if_current t(".ao3_news_drafts"), drafts_admin_posts_path %>
-  </li>
+  <% if policy(AdminPost).can_draft? %>
+    <li>
+      <%= span_if_current t(".ao3_news_drafts"), drafts_admin_posts_path %>
+    </li>
+  <% end %>
   <% if policy(AdminPost).can_post? %>
     <li>
       <%= span_if_current t(".post_ao3_news"), new_admin_post_path %>

From d8befd7c5a4b8e33fa3a2bc5184235b82fa40375 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 24 May 2026 16:53:28 -0700
Subject: [PATCH 07/12] AO3-6960 Missing closing tag and double 'an'

---
 app/views/admin_posts/_posting_fieldset.html.erb | 2 +-
 features/admins/admin_post_draft_news.feature    | 2 +-
 features/admins/admin_post_news.feature          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/admin_posts/_posting_fieldset.html.erb b/app/views/admin_posts/_posting_fieldset.html.erb
index a6f9181968c..21c849d45ce 100644
--- a/app/views/admin_posts/_posting_fieldset.html.erb
+++ b/app/views/admin_posts/_posting_fieldset.html.erb
@@ -8,7 +8,7 @@
     <% end %>
 
     <% if @preview_mode %>
-      <li><%= form.submit t(".actions.edit"), name: "edit_button" %>
+      <li><%= form.submit t(".actions.edit"), name: "edit_button" %></li>
     <% else %>
       <li><%= form.submit t(".actions.preview"), name: "preview_button" %></li>
     <% end %>
diff --git a/features/admins/admin_post_draft_news.feature b/features/admins/admin_post_draft_news.feature
index e533654786d..505af8b55eb 100644
--- a/features/admins/admin_post_draft_news.feature
+++ b/features/admins/admin_post_draft_news.feature
@@ -1,7 +1,7 @@
 @admin @comments
 Feature: Admin Actions to Draft News
   In order to post news items
-  As an an admin
+  As an admin
   I want to be able to create drafts and preview my changes
 
   Scenario: Draft admin posts are only visible in the drafts index
diff --git a/features/admins/admin_post_news.feature b/features/admins/admin_post_news.feature
index b2449150db9..902cc268a06 100755
--- a/features/admins/admin_post_news.feature
+++ b/features/admins/admin_post_news.feature
@@ -1,7 +1,7 @@
 @admin @comments
 Feature: Admin Actions to Post News
   In order to post news items
-  As an an admin
+  As an admin
   I want to be able to use the Admin Posts screen
 
   Scenario: Must be authorized to post

From 1897463c9a4d7eeb17bf3018cd8aff14f8b12d96 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 24 May 2026 17:24:55 -0700
Subject: [PATCH 08/12] AO3-6960 Add validation to prevent posting translations
 before the original

---
 app/models/admin_post.rb                        |  9 ++++++++-
 config/locales/models/en.yml                    |  2 ++
 spec/controllers/admin_posts_controller_spec.rb | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/models/admin_post.rb b/app/models/admin_post.rb
index c09a1f752d0..e2910cb5203 100644
--- a/app/models/admin_post.rb
+++ b/app/models/admin_post.rb
@@ -33,6 +33,7 @@ class AdminPost < ApplicationRecord
   validate :translated_post_must_exist
 
   validate :translated_post_language_must_differ
+  validate :translated_post_must_be_posted_first
 
   scope :non_translated, -> { where("translated_post_id IS NULL") }
 
@@ -85,10 +86,16 @@ def translated_post_must_exist
   def translated_post_language_must_differ
     return if translated_post.blank?
     return unless translated_post.language == language
-          
+
     errors.add(:translated_post_id, "cannot be same language as original post")
   end
 
+  def translated_post_must_be_posted_first
+    return if translated_post.blank?
+
+    errors.add(:translated_post_id, :must_be_posted_first) if translated_post.draft? && self.posted?
+  end
+
   ####################
   # DELAYED JOBS
   ####################
diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml
index 9ad0482194c..bd0ebac21a2 100644
--- a/config/locales/models/en.yml
+++ b/config/locales/models/en.yml
@@ -98,6 +98,8 @@ en:
             comment_permissions:
               format: "%{message}"
               invalid_permissions: Comment permissions are invalid.
+            translated_post_id:
+              must_be_posted_first: cannot be posted before the original post
         block:
           attributes:
             blocked:
diff --git a/spec/controllers/admin_posts_controller_spec.rb b/spec/controllers/admin_posts_controller_spec.rb
index fa9d94f1d2a..aceaf5fc9b0 100644
--- a/spec/controllers/admin_posts_controller_spec.rb
+++ b/spec/controllers/admin_posts_controller_spec.rb
@@ -346,6 +346,19 @@
 
     it_behaves_like "an action only authorized admins can access", authorized_roles: posting_roles
     it_behaves_like "an action that non-admins cannot access"
+
+    context "when translated post is not posted" do
+      let(:original_post) { create(:admin_post, :draft) }
+      let(:admin_post) { create(:admin_post, :draft, translated_post: original_post, language_id: create(:language)) }
+
+      before { fake_login_admin(create(:superadmin)) }
+      it "does not post the translation" do
+        subject
+
+        expect(admin_post.reload.posted?).to be_falsey
+        it_redirects_to_with_error(edit_admin_post_path(admin_post), "Sorry, that Admin Post could not be posted.")
+      end
+    end
   end
 
   describe "DELETE #destroy" do

From 5f0789cf9bbb928797f8d0e1ebcf50ee3d83cadc Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 7 Jun 2026 16:45:51 -0700
Subject: [PATCH 09/12] AO3-6960 Remove unused variable names

---
 spec/helpers/admin_post_helper_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/helpers/admin_post_helper_spec.rb b/spec/helpers/admin_post_helper_spec.rb
index 7863ac62ee1..38b0501589d 100644
--- a/spec/helpers/admin_post_helper_spec.rb
+++ b/spec/helpers/admin_post_helper_spec.rb
@@ -19,9 +19,9 @@
 
     context "when the news is posted" do
       it "does not include draft translations" do
-        _german_post = create(:admin_post, :draft, language: german, translated_post: english_post)
+        create(:admin_post, :draft, language: german, translated_post: english_post)
         finnish_post = create(:admin_post, language: finnish, translated_post: english_post)
-        _indonesian_post = create(:admin_post, :draft, language: indonesian, translated_post: english_post)
+        create(:admin_post, :draft, language: indonesian, translated_post: english_post)
 
         expect(sorted_translations(english_post.reload)).to eq([finnish_post])
       end

From 2e0f8401978a54e4061ec4402910d6efba5647ac Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 7 Jun 2026 16:48:42 -0700
Subject: [PATCH 10/12] AO3-6960 Use form_with

---
 app/views/admin_posts/preview.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin_posts/preview.html.erb b/app/views/admin_posts/preview.html.erb
index efb9b768cf9..7de8240b41d 100755
--- a/app/views/admin_posts/preview.html.erb
+++ b/app/views/admin_posts/preview.html.erb
@@ -5,7 +5,7 @@
   </div>
   <div class="clear"><!-- presentational --></div>
 
-  <%= form_for(@admin_post) do |f| %>
+  <%= form_with model: @admin_post do |f| %>
     <%= f.hidden_field :title, value: @admin_post.title.to_s %>
     <%= f.hidden_field :content, value: @admin_post.content.to_s %>
     <% unless @admin_post.translated_post %>

From 2c100fa00a5064191623d070f397a2ebdb37c65e Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 7 Jun 2026 17:11:13 -0700
Subject: [PATCH 11/12] AO3-6960 Add model spec test for posting translation
 first

---
 spec/models/admin_post_spec.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spec/models/admin_post_spec.rb b/spec/models/admin_post_spec.rb
index d7bf8f2aa07..f54c3d1883f 100644
--- a/spec/models/admin_post_spec.rb
+++ b/spec/models/admin_post_spec.rb
@@ -47,6 +47,18 @@
     end
   end
 
+  describe "#translated_post_must_be_posted_first" do
+    let(:admin_post) { create(:admin_post, :draft) }
+    let(:translation) { create(:admin_post, :draft, translated_post_id: admin_post.id, language_id: create(:language).id) }
+
+    it "returns error when posting a translation first" do
+      translation.posted = true
+
+      expect(translation.valid?).to be_falsey
+      expect(translation.errors).to be_added(:translated_post_id, :must_be_posted_first)
+    end
+  end
+
   describe "#set_published_at" do
     before { freeze_time }
 
@@ -70,6 +82,7 @@
     it "posts draft translations" do
       admin_post.reload.update!(posted: true)
       expect(translation.reload.posted?).to be_truthy
+      expect(translation.published_at).to eq(admin_post.published_at)
     end
   end
 end

From 67dfe5bfe6bb73710ff708c0051213e556ac5323 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Sun, 7 Jun 2026 17:16:20 -0700
Subject: [PATCH 12/12] AO3-6960 Use update_all when posting translations

---
 app/models/admin_post.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/admin_post.rb b/app/models/admin_post.rb
index e2910cb5203..9ba5ad5377d 100644
--- a/app/models/admin_post.rb
+++ b/app/models/admin_post.rb
@@ -162,10 +162,6 @@ def set_published_at
   def post_translations
     return if translations.blank? || !self.posted
 
-    transaction do
-      translations.find_each do |post|
-        post.update(posted: true, published_at: self.published_at)
-      end
-    end
+    translations.update_all(posted: true, published_at: self.published_at)
   end
 end