fix generator problem. allow no auth
This commit is contained in:
@ -1,6 +1,11 @@
|
||||
module Merged
|
||||
class MergedController < ::ApplicationController
|
||||
before_action :authenticate_member!
|
||||
before_action :authenticate_if
|
||||
layout "merged/application"
|
||||
|
||||
def authenticate_if
|
||||
return unless respond_to? :"authenticate_member!"
|
||||
authenticate_member!
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -25,8 +25,9 @@
|
||||
= link_to merged.changes_index_path do
|
||||
%button.my-3.button{class: last_change_class}= last_change_text
|
||||
|
||||
= form_tag( main_app.destroy_member_session_path , {method: :delete } ) do
|
||||
%button.flex.w-full.items-center.gap-2.rounded-lg.px-4.py-2.text-sm.text-blue-700.hover:bg-red-50{:role => "menuitem", :type => "submit"}
|
||||
%svg.h-4.w-4{:fill => "none", :stroke => "currentColor", "stroke-width" => "2", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"}
|
||||
%path{:d => "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16", "stroke-linecap" => "round", "stroke-linejoin" => "round"}
|
||||
Sign out
|
||||
- if main_app.respond_to? :destroy_member_session_path
|
||||
= form_tag( main_app.destroy_member_session_path , {method: :delete } ) do
|
||||
%button.flex.w-full.items-center.gap-2.rounded-lg.px-4.py-2.text-sm.text-blue-700.hover:bg-red-50{:role => "menuitem", :type => "submit"}
|
||||
%svg.h-4.w-4{:fill => "none", :stroke => "currentColor", "stroke-width" => "2", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"}
|
||||
%path{:d => "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16", "stroke-linecap" => "round", "stroke-linejoin" => "round"}
|
||||
Sign out
|
||||
|
Reference in New Issue
Block a user