diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 7b6e7f4a..7b6fe533 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -6,7 +6,7 @@ class AdminController < ApplicationController before_action :require_admin_access, unless: -> { Rails.env.development? } def dashboard - @reports = EndOfDayAnalyticsReport.order('day DESC').limit(90) + @reports = EndOfDayAnalyticsReport.order('day DESC') end def content_type diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb index 715b90ee..209fb60e 100644 --- a/app/controllers/folders_controller.rb +++ b/app/controllers/folders_controller.rb @@ -20,7 +20,7 @@ class FoldersController < ApplicationController Document.where(folder_id: @folder.id).update_all(folder_id: nil) # Relocate all child folders in this folder to the root "folder" - Folder.where(parent_folder_id: @folder.id).update_all(folder_id: nil) + Folder.where(parent_folder_id: @folder.id).update_all(parent_folder_id: nil) @folder.destroy! redirect_to(documents_path, notice: "Folder #{@folder.title} deleted!") diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index d1e59fca..4d501505 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -33,6 +33,17 @@ class MainController < ApplicationController def dashboard @page_title = "My notebook" + messageboard_ids_to_exclude = [38, 26, 31, 32, 30, 33, 27] + most_recent_posts = Thredded::Post.where.not(messageboard_id: messageboard_ids_to_exclude) + .where(moderation_state: "approved") + .order('id DESC') + .limit(300) + .shuffle + .first(3) + @most_recent_threads = Thredded::Topic.where(id: most_recent_posts.pluck(:postable_id)) + .where(moderation_state: "approved") + .includes(:posts, :messageboard) + set_questionable_content # for questions end diff --git a/app/models/page_types/government.rb b/app/models/page_types/government.rb index 0d188d68..2019cf37 100644 --- a/app/models/page_types/government.rb +++ b/app/models/page_types/government.rb @@ -10,7 +10,7 @@ class Government < ApplicationRecord include Serendipitous::Concern include Authority::Abilities - self.authorizer_name = 'ExtendedContentAuthorizer' + self.authorizer_name = Date.current <= 'November 17, 2022'.to_date ? 'CoreContentAuthorizer' : 'ExtendedContentAuthorizer' relates :leaders, with: :government_leaders relates :groups, with: :government_groups diff --git a/app/views/admin/dashboard.html.erb b/app/views/admin/dashboard.html.erb index 00d8f498..e393baee 100644 --- a/app/views/admin/dashboard.html.erb +++ b/app/views/admin/dashboard.html.erb @@ -5,10 +5,10 @@