wait #6471 @0.25

diff --git a/src/app/Magic/Fields/SelectFromModel.php b/src/app/Magic/Fields/SelectFromModel.php
index df917825cf9338476e975c5e88beba504e46e60a..b4a64508d9203acddc8e2bc297d2297ac8f59459 100644 (file)
--- a/src/app/Magic/Fields/SelectFromModel.php
+++ b/src/app/Magic/Fields/SelectFromModel.php
@@ -22,6 +22,8 @@ class SelectFromModel extends Model
     protected $_order = false;
     protected $_allows_null = false;
 
+    protected $_filterType = 'dropdown';
+
     protected $_ajax = true;
 
 

diff --git a/src/app/Magic/Models/ExternalServer.php b/src/app/Magic/Models/ExternalServer.php
index 093726a378930aa546bbba68d89dfb2e07af1e67..6fcbf38cbeb12b82eef00148de0944d3fdfb0e89 100644 (file)
--- a/src/app/Magic/Models/ExternalServer.php
+++ b/src/app/Magic/Models/ExternalServer.php
@@ -33,7 +33,7 @@ class ExternalServer extends CubistMagicAbstractModel implements IServer
         $this->addField('username', Text::class, __('Nom d\'utilisateur'), ['when' => ['protocol' => $this->getUsernameProtocols()]]);
         $this->addField('password', Password::class, __('Mot de passe'), ['when' => ['protocol' => $this->getPasswordProtocols()]]);
         $this->addField('base_path', Text::class, __('Chemin de base'), ['default' => '/']);
-        $this->addField('base_url', Text::class, __('URL de base'), ['default' => 'https://', 'column' => true]);
+        $this->addField('base_url', Text::class, __('URL de base'), ['default' => 'https://', 'column' => true, 'column_function_name' => 'getBaseURL']);
     }
 
     public static function getAllServers()