Upstream sync

app/controllers/broadcasts_controller.rb

@@ -5,6 +5,7 @@ class BroadcastsController < ApplicationController
   before_action :build_broadcast, only: [:new, :create]
   before_action :set_broadcast, only: [:show, :destroy, :update]
   before_action :set_multi_view_broadcasts, only: [:show]
+  before_action :show_splash_screen, only: :index
 
   def index
     @broadcasts = filtered_broadcasts.order_by_recent.paginate(page: params[:page])
@@ -49,6 +50,10 @@ class BroadcastsController < ApplicationController
 
   private
 
+  def show_splash_screen
+    render :splash if broadcasts.count.zero?
+  end
+
   def broadcast_params
     params.require(:broadcast).permit(:name, files: [])
   end

app/controllers/contract_templates_controller.rb

@@ -7,6 +7,7 @@ class ContractTemplatesController < ApplicationController
 
   before_action :set_project, except: [:destroy]
   before_action :set_contract_template, only: [:destroy]
+  before_action :show_splash_screen, only: :index
 
   def index
     @contract_templates = contract_templates.non_archived.order_by_name.paginate(page: params[:page])
@@ -38,6 +39,10 @@ class ContractTemplatesController < ApplicationController
 
   private
 
+  def show_splash_screen
+    render :splash if contract_templates.non_archived.count.zero?
+  end
+
   def set_contract_template
     @contract_template = authorize contract_templates.find(params[:id])
   end

app/controllers/public/misc_releases_controller.rb

@@ -46,6 +46,7 @@ class Public::MiscReleasesController < Public::BaseController
       .permit(
         person_params,
         guardian_params,
+        questionnaire_params,
         :signature_base64,
         :locale,
         :contract_template,
@@ -85,6 +86,26 @@ class Public::MiscReleasesController < Public::BaseController
     ]
   end
 
+  def questionnaire_params
+    [
+      :question_1_answer,
+      :question_2_answer,
+      :question_3_answer,
+      :question_4_answer,
+      :question_5_answer,
+      :question_6_answer,
+      :question_7_answer,
+      :question_8_answer,
+      :question_9_answer,
+      :question_10_answer,
+      :question_11_answer,
+      :question_12_answer,
+      :question_13_answer,
+      :question_14_answer,
+      :question_15_answer,
+    ]
+  end
+
   def misc_release_params_with_locale
     misc_release_params.merge(locale: I18n.locale)
   end

app/controllers/task_requests_controller.rb

@@ -4,6 +4,7 @@ class TaskRequestsController < ApplicationController
   before_action :set_project
   before_action :build_task_request, only: [:new, :create]
   before_action :set_task_request, only: [:show, :edit, :update, :cancel]
+  before_action :show_splash_screen, only: :index
 
   def index
     @task_requests = task_requests.order_by_recent.paginate(page: params[:page])
@@ -46,6 +47,10 @@ class TaskRequestsController < ApplicationController
 
   private
 
+  def show_splash_screen
+    render :splash if task_requests.count.zero?
+  end
+
   def task_request_params
     params.require(:task_request).permit(:description, :deadline, :time_allowed, :additional_notes, files: [])
   end

app/controllers/videos_controller.rb

@@ -3,6 +3,7 @@ class VideosController < ApplicationController
 
   before_action :set_project, only: [:index, :new, :create, :landing]
   before_action :set_video, only: [:edit, :update]
+  before_action :show_splash_screen, only: :index
 
   def landing
     authorize Video, :new?
@@ -60,6 +61,10 @@ class VideosController < ApplicationController
 
   private
 
+  def show_splash_screen
+    render :splash if videos.count.zero?
+  end
+
   def set_project
     @project = policy_scope(Project).find(params[:project_id])
   end