Merge pull request NeoRazorX#1874 from Yopli2k/BaseWidget

Añadido nuevo atributo a los widgets: fieldclick

Author: NeoRazorX

Core/Lib/Widget/BaseWidget.php

@@ -39,6 +39,8 @@ class BaseWidget extends VisualItem
      */
     public $fieldname;
 
+    public $fieldclick;
+
     /**
      * @var string
      */
@@ -79,6 +81,11 @@ class BaseWidget extends VisualItem
      */
     protected $value;
 
+    /**
+     * @var mixed
+     */
+    protected $valueOnClick = null;
+
     /**
      * @param array $data
      */
@@ -87,6 +94,7 @@ public function __construct($data)
         parent::__construct($data);
         $this->autocomplete = false;
         $this->fieldname = $data['fieldname'];
+        $this->fieldclick = $data['fieldclick'] ?? '';
         $this->icon = $data['icon'] ?? '';
         $this->onclick = $data['onclick'] ?? '';
         $this->readonly = $data['readonly'] ?? 'false';
@@ -264,12 +272,13 @@ protected function loadOptions($children): void
      */
     protected function onclickHtml($inside, $titleurl = '')
     {
-        if (empty($this->onclick) || is_null($this->value)) {
+        $value = empty($this->valueOnClick) ? $this->value : $this->valueOnClick;
+        if (empty($this->onclick) || is_null($value)) {
             return empty($titleurl) ? $inside : '<a href="' . $titleurl . '">' . $inside . '</a>';
         }
 
-        $params = strpos($this->onclick, '?') !== false ? '&' : '?';
-        return '<a href="' . Tools::config('route') . '/' . $this->onclick . $params . 'code=' . rawurlencode($this->value)
+        $params = str_contains($this->onclick, '?') ? '&' : '?';
+        return '<a href="' . Tools::config('route') . '/' . $this->onclick . $params . 'code=' . rawurlencode($value)
             . '" class="cancelClickable">' . $inside . '</a>';
     }
 
@@ -291,6 +300,9 @@ protected function readonly(): bool
     protected function setValue($model)
     {
         $this->value = $model->{$this->fieldname} ?? null;
+        if (false === empty($this->fieldclick)) {
+            $this->valueOnClick = $model->{$this->fieldclick} ?? null;
+        }
     }
 
     /**