Refs 5586; CR #1

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/af83/decorator/link.rb b/lib/af83/decorator/link.rb
index e7ab90d55..83d40eba8 100644
--- a/lib/af83/decorator/link.rb
+++ b/lib/af83/decorator/link.rb
@@ -136,9 +136,9 @@ class AF83::Decorator::Link
 
   def to_html
     if block_given?
-      link = Link.new(@options)
+      link = AF83::Decorator::Link.new(@options).bind_to_context(context, @action)
       yield link
-      return link.bind_to_context(context, @action).to_html
+      return link.to_html
     end
     if type&.to_sym == :button
       HTMLElement.new(
diff --git a/lib/af83/enhanced_decorator.rb b/lib/af83/enhanced_decorator.rb
index ee18686f4..aa9620dba 100644
--- a/lib/af83/enhanced_decorator.rb
+++ b/lib/af83/enhanced_decorator.rb
@@ -45,9 +45,10 @@ module AF83::EnhancedDecorator
     def edit_action_link args={}, &block
       opts = {
         primary: %i(show index),
+        policy: :edit,
         before_block: -> (l){
           l.content { h.t('actions.edit') }
-          l.href { [object] }
+          l.href { [:edit, object] }
         }
       }
       action_link opts.update(args), &block