X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fslick%2Fsrc%2FForm%2FSlickAdmin.php;h=5a97c6db06d20125963ac67a7d4d857df86964eb;hp=32986d7720b5465f66a7d51546ad116089348bcb;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae

diff --git a/web/modules/contrib/slick/src/Form/SlickAdmin.php b/web/modules/contrib/slick/src/Form/SlickAdmin.php
index 32986d772..5a97c6db0 100644
--- a/web/modules/contrib/slick/src/Form/SlickAdmin.php
+++ b/web/modules/contrib/slick/src/Form/SlickAdmin.php
@@ -7,7 +7,7 @@ use Drupal\Core\Render\Element;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\blazy\Form\BlazyAdminInterface;
+use Drupal\blazy\Dejavu\BlazyAdminExtended;
 use Drupal\slick\SlickManagerInterface;
 
 /**
@@ -20,7 +20,7 @@ class SlickAdmin implements SlickAdminInterface {
   /**
    * The blazy admin service.
    *
-   * @var \Drupal\blazy\Form\BlazyAdminInterface
+   * @var \Drupal\blazy\Dejavu\BlazyAdminExtended
    */
   protected $blazyAdmin;
 
@@ -34,12 +34,12 @@ class SlickAdmin implements SlickAdminInterface {
   /**
    * Constructs a SlickAdmin object.
    *
-   * @param \Drupal\blazy\Form\BlazyAdminInterface $blazy_admin
+   * @param \Drupal\blazy\Dejavu\BlazyAdminExtended $blazy_admin
    *   The blazy admin service.
    * @param \Drupal\slick\SlickManagerInterface $manager
    *   The slick manager service.
    */
-  public function __construct(BlazyAdminInterface $blazy_admin, SlickManagerInterface $manager) {
+  public function __construct(BlazyAdminExtended $blazy_admin, SlickManagerInterface $manager) {
     $this->blazyAdmin = $blazy_admin;
     $this->manager = $manager;
   }
@@ -132,6 +132,11 @@ class SlickAdmin implements SlickAdminInterface {
       $this->blazyAdmin->openingForm($form, $definition);
 
       $form['optionset']['#title'] = $this->t('Optionset main');
+
+      if ($this->manager()->getModuleHandler()->moduleExists('slick_ui')) {
+        $route_name = 'entity.slick.collection';
+        $form['optionset']['#description'] = $this->t('Manage optionsets at <a href=":url" target="_blank">the optionset admin page</a>.', [':url' => Url::fromRoute($route_name)->toString()]);
+      }
     }
 
     if (!empty($definition['nav']) || !empty($definition['thumbnails'])) {
@@ -416,11 +421,27 @@ class SlickAdmin implements SlickAdminInterface {
 
   /**
    * Return the field formatter settings summary.
+   *
+   * @deprecated: Removed for self::getSettingsSummary().
    */
   public function settingsSummary($plugin, $definition = []) {
     return $this->blazyAdmin->settingsSummary($plugin, $definition);
   }
 
+  /**
+   * Return the field formatter settings summary.
+   *
+   * @todo: Remove second param $plugin for post-release for Blazy RC2+.
+   */
+  public function getSettingsSummary($definition = [], $plugin = NULL) {
+    // @todo: Remove condition for Blazy RC2+.
+    if (!method_exists($this->blazyAdmin, 'getSettingsSummary')) {
+      return $this->blazyAdmin->settingsSummary($plugin, $definition);
+    }
+
+    return $this->blazyAdmin->getSettingsSummary($definition);
+  }
+
   /**
    * Returns available fields for select options.
    */
@@ -432,7 +453,7 @@ class SlickAdmin implements SlickAdminInterface {
    * Returns re-usable logic, styling and assets across fields and Views.
    */
   public function finalizeForm(array &$form, $definition = []) {
-    return $this->blazyAdmin->finalizeForm($form, $definition);
+    $this->blazyAdmin->finalizeForm($form, $definition);
   }
 
 }