Updated config form notes.

mautic · Feb 18, 2023 · fbd6541 · fbd6541
1 parent 02381c5
commit fbd6541
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/app/bundles/IntegrationsBundle/Controller/ConfigController.php b/app/bundles/IntegrationsBundle/Controller/ConfigController.php
@@ -212,17 +212,7 @@ private function showForm(Form $form)
             $integrationObject->getRedirectUri()
             : false;
 
-        $authorizationNote = $integrationObject instanceof ConfigFormNotesInterface ?
-            $integrationObject->getAuthorizationNote()
-            : null;
-
-        $featuresNote = $integrationObject instanceof ConfigFormNotesInterface ?
-            $integrationObject->getFeaturesNote()
-            : null;
-
-        $fieldMappingNote = $integrationObject instanceof ConfigFormNotesInterface ?
-            $integrationObject->getFieldMappingNote()
-            : null;
+        $useConfigFormNotes = $integrationObject instanceof ConfigFormNotesInterface;
 
         return $this->delegateView(
             [
@@ -237,9 +227,7 @@ private function showForm(Form $form)
                     'useFeatureSettings'  => $useFeatureSettings,
                     'useAuthorizationUrl' => $useAuthorizationUrl,
                     'callbackUrl'         => $callbackUrl,
-                    'authorizationNote'   => $authorizationNote,
-                    'featuresNote'        => $featuresNote,
-                    'fieldMappingNote'    => $fieldMappingNote,
+                    'useConfigFormNotes'  => $useConfigFormNotes,
                 ],
                 'contentTemplate' => $integrationObject->getConfigFormContentTemplate()
                     ?: 'IntegrationsBundle:Config:form.html.twig',

diff --git a/app/bundles/IntegrationsBundle/Views/Config/form.html.php b/app/bundles/IntegrationsBundle/Views/Config/form.html.php
@@ -61,9 +61,9 @@
 <div class="tab-content pa-md bg-white">
     <!-- Enabled\Auth -->
     <div class="tab-pane fade <?php if ('details-container' == $activeTab): echo 'in active'; endif; ?> bdr-w-0" id="details-container">
-        <?php if ($authorizationNote instanceof \Mautic\IntegrationsBundle\DTO\Note): ?>
-            <div class="alert alert-<?php echo $authorizationNote->getType(); ?>">
-                <?php echo $view['translator']->trans($authorizationNote->getNote()); ?>
+        <?php if ($useConfigFormNotes && $integrationObject->getAuthorizationNote() instanceof \Mautic\IntegrationsBundle\DTO\Note): ?>
+            <div class="alert alert-<?php echo $integrationObject->getAuthorizationNote()->getType(); ?>">
+                <?php echo $view['translator']->trans($integrationObject->getAuthorizationNote()->getNote()); ?>
             </div>
         <?php endif; ?>
 
@@ -102,9 +102,9 @@
     <!-- Features -->
     <?php if ($showFeaturesTab): ?>
     <div class="tab-pane fade <?php if ('features-container' == $activeTab): echo 'in active'; endif; ?> bdr-w-0" id="features-container">
-        <?php if ($featuresNote instanceof \Mautic\IntegrationsBundle\DTO\Note): ?>
-            <div class="alert alert-<?php echo $featuresNote->getType(); ?>">
-                <?php echo $view['translator']->trans($featuresNote->getNote()); ?>
+        <?php if ($useConfigFormNotes && $integrationObject->getFeaturesNote() instanceof \Mautic\IntegrationsBundle\DTO\Note): ?>
+            <div class="alert alert-<?php echo $integrationObject->getFeaturesNote()->getType(); ?>">
+                <?php echo $view['translator']->trans($integrationObject->getFeaturesNote()->getNote()); ?>
             </div>
         <?php endif; ?>
         <?php
@@ -143,9 +143,9 @@
         <div class="has-error">
             <?php echo $view['form']->errors($objectFieldMapping); ?>
         </div>
-        <?php if ($fieldMappingNote instanceof \Mautic\IntegrationsBundle\DTO\Note): ?>
-            <div class="alert alert-<?php echo $fieldMappingNote->getType(); ?>">
-                <?php echo $view['translator']->trans($fieldMappingNote->getNote()); ?>
+        <?php if ($useConfigFormNotes && $integrationObject->getFieldMappingNote() instanceof \Mautic\IntegrationsBundle\DTO\Note): ?>
+            <div class="alert alert-<?php echo $integrationObject->getFieldMappingNote()->getType(); ?>">
+                <?php echo $view['translator']->trans($integrationObject->getFieldMappingNote()->getNote()); ?>
             </div>
         <?php endif; ?>
         <?php echo $view['form']->row($objectFieldMapping['filter-keyword']); ?>