Merge pull request #966 from gamecat2d/806-menu-bar-not-displaying-co…

…rrectly 806 : the navbar is not displayed correctly
rubyforgood · May 27, 2021 · c5b0ae1 · c5b0ae1
2 parents 63f6c4c + 1b84c07
commit c5b0ae1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/controllers/asks_controller.rb b/app/controllers/asks_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AsksController < PublicController
-  layout 'without_navbar', only: %i[new create]
+  layout :determine_layout, only: %i[new create]
 
   def index
     redirect_to contributions_path
@@ -47,4 +47,8 @@ def render_form(submission)
 
     render :new
   end
+
+  def determine_layout
+    'without_navbar' unless context.system_settings.display_navbar?
+  end
 end
diff --git a/app/controllers/offers_controller.rb b/app/controllers/offers_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class OffersController < PublicController
-  layout 'without_navbar', only: %i[new create]
+  layout :determine_layout, only: %i[new create]
 
   def index
     redirect_to contributions_path
@@ -47,4 +47,8 @@ def render_form(submission)
 
     render :new
   end
+
+  def determine_layout
+    'without_navbar' unless context.system_settings.display_navbar?
+  end
 end