fix logic of event showall_announcement view without feedback

exponentcms · Sep 18, 2018 · 5465924 · 5465924
1 parent 466639a
commit 5465924
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/framework/modules/events/views/event/showall_announcement.bootstrap3.tpl b/framework/modules/events/views/event/showall_announcement.bootstrap3.tpl
@@ -111,8 +111,6 @@
                 </div>
                 {if (!empty($item->feedback_form) && $item->feedback_form != 'Disallow Feedback')}
                     {$feedback_form = $item->feedback_form}
-                {/if}
-                {if !empty($feedback_form)}
                     {$event = $item}
                     {toggle unique=$name|cat:$item->id collapsed=1 title='Click to open'|gettext|cat:' '|cat:$feedback_form}
                         {include file="email/$feedback_form.tpl"}

diff --git a/framework/modules/events/views/event/showall_announcement.bootstrap4.tpl b/framework/modules/events/views/event/showall_announcement.bootstrap4.tpl
@@ -111,8 +111,6 @@
                 </div>
                 {if (!empty($item->feedback_form) && $item->feedback_form != 'Disallow Feedback')}
                     {$feedback_form = $item->feedback_form}
-                {/if}
-                {if !empty($feedback_form)}
                     {$event = $item}
                     {toggle unique=$name|cat:$item->id collapsed=1 title='Click to open'|gettext|cat:' '|cat:$feedback_form}
                         {include file="email/$feedback_form.tpl"}

diff --git a/framework/modules/events/views/event/showall_announcement.tpl b/framework/modules/events/views/event/showall_announcement.tpl
@@ -116,8 +116,6 @@
             </div>
             {if (!empty($item->feedback_form) && $item->feedback_form != 'Disallow Feedback')}
                 {$feedback_form = $item->feedback_form}
-            {/if}
-            {if !empty($feedback_form)}
                 {$event = $item}
                 {toggle unique=$name|cat:$item->id collapsed=1 title='Click to open'|gettext|cat:' '|cat:$feedback_form}
                     {include file="email/$feedback_form.tpl"}