Merge pull request #6 from vincent-chapron/bugfix/fix-vic-link-url

Change vic link url by vic link

Author: paulandrieux

Resolver/WidgetButtonContentResolver.php

@@ -4,9 +4,25 @@
 
 use Victoire\Bundle\WidgetBundle\Model\Widget;
 use Victoire\Bundle\WidgetBundle\Resolver\BaseWidgetContentResolver;
+use Victoire\Widget\ButtonBundle\Entity\WidgetButton;
 
 class WidgetButtonContentResolver extends BaseWidgetContentResolver
 {
+    /**
+     * Get the static content of the widget
+     *
+     * @param Widget $widget
+     *
+     * @return string
+     */
+    public function getWidgetStaticContent(Widget $widget)
+    {
+        $parameters = parent::getWidgetStaticContent($widget);
+        $parameters = $this->setButtonParameters($widget, $parameters);
+
+        return $parameters;
+    }
+
     /**
      * Get the business entity content
      * @param Widget $widget
@@ -22,6 +38,7 @@ public function getWidgetBusinessEntityContent(Widget $widget)
 
         $parameters = $this->getWidgetStaticContent($widget);
         $this->populateParametersWithWidgetFields($widget, $entity, $parameters);
+        $parameters = $this->setButtonParameters($widget, $parameters);
 
         return $parameters;
     }
@@ -43,6 +60,22 @@ public function getWidgetEntityContent(Widget $widget)
 
         $parameters = $this->getWidgetStaticContent($widget);
         $this->populateParametersWithWidgetFields($widget, $entity, $parameters);
+        $parameters = $this->setButtonParameters($widget, $parameters);
+
+        return $parameters;
+    }
+
+    /**
+     * Get the content of the widget for the query mode
+     *
+     * @param Widget $widget
+     *
+     * @return string
+     *
+     */
+    public function getWidgetQueryContent(Widget $widget) {
+        $parameters = parent::getWidgetQueryContent($widget);
+        $parameters = $this->setButtonParameters($widget, $parameters);
 
         return $parameters;
     }
@@ -65,4 +98,18 @@ public function readIntoWidgetRouteParameters(Widget $widget)
         }
         $widget->getLink()->setRouteParameters($params);
     }
+
+    protected function setButtonParameters(Widget $widget, $parameters) {
+        /** @var WidgetButton $widget */
+        $icon = ($parameters['icon']) ? "<i class='fa " . $parameters['icon'] . "'></i>" : "";
+        $label = $icon . " " . $parameters['title'];
+
+        $block = ($parameters['isBlock']) ? "btn-block" : "";
+        $class = "btn btn-" . $parameters['size'] . " btn-" . $parameters['style'] . " " . $block;
+        $title = $parameters['hoverTitle'];
+
+        $parameters = array_merge($parameters, ['attributes' => ['class' => $class, 'title' => $title], 'label' => $label]);
+        return $parameters;
+    }
+
 }

Resources/views/show.html.twig

@@ -1,12 +1,5 @@
 {% extends 'VictoireCoreBundle:Widget:show.html.twig' %}
 
 {% block content %}
-
-{% set targetTag = link.target == "ajax-modal" ? 'data-toggle=' ~ link.target : 'target=' ~ link.target|default('_parent') %}
-<a href="{{ vic_link_url(link.parameters) }}" {{ targetTag }} title="{{ hoverTitle }}" class="btn btn-{{ size }} btn-{{ style }}{% if isBlock %} btn-block{% endif %}">
-    {% if icon %}
-    <i class="fa {{icon}}"></i>
-    {% endif %}
-    {{ title|raw|nl2br }}
-</a>
+    {{ vic_link(link.parameters, label, attributes) }}
 {% endblock content %}