Skip to content
Snippets Groups Projects
Commit e8057818 authored by git's avatar git Committed by Mike Feranda
Browse files

Issue #3146090 by Project Update Bot: Automated Drupal 9 compatibility fixes

parent ca7329f3
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
namespace Drupal\aggrid\Plugin\Field\FieldFormatter;
use Drupal\aggrid\Entity\Aggrid;
use Drupal\aggrid\Entity;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Xss;
......@@ -73,7 +74,7 @@ class AggridFormatterType extends FormatterBase {
$item_id = Html::getUniqueId("ht-$field_name-$delta");
$aggridEntity = Entity\Aggrid::load($items[$delta]->aggrid_id);
$aggridEntity = Aggrid::load($items[$delta]->aggrid_id);
$aggridDefault = json_decode($aggridEntity->get('aggridDefault'));
if (empty($items[$delta]->value) || $items[$delta]->value == '{}') {
......
......@@ -2,6 +2,7 @@
namespace Drupal\aggrid\Plugin\Field\FieldFormatter;
use Drupal\aggrid\Entity\Aggrid;
use Drupal\aggrid\Entity;
use Drupal\Component\Utility\Html;
use Drupal\Core\Field\FieldItemInterface;
......@@ -203,7 +204,7 @@ class HtmlFormatterType extends FormatterBase {
$item_id = Html::getUniqueId("ht-$field_name-$delta");
$aggridEntity = Entity\Aggrid::load($items[$delta]->aggrid_id);
$aggridEntity = Aggrid::load($items[$delta]->aggrid_id);
if ($aggridEntity == '') {
......@@ -229,7 +230,7 @@ class HtmlFormatterType extends FormatterBase {
$pinnedBottomRowData = @json_decode($aggridEntity->get('addOptions'))->pinnedBottomRowData;
$aggridRowSettings = @json_decode(json_encode($aggridDefault->rowSettings), true);
if (isset($gsRowSettings) && isset($aggridRowSettings)) {
$aggridRowSettings = array_replace_recursive($gsRowSettings, $aggridRowSettings);
}
......
......@@ -2,6 +2,7 @@
namespace Drupal\aggrid\Plugin\Field\FieldWidget;
use Drupal\aggrid\Entity\Aggrid;
use Drupal\aggrid\Entity;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Field\FieldItemListInterface;
......@@ -68,7 +69,7 @@ class AggridJsonWidgetType extends WidgetBase {
}
else {
$aggridEntity = Entity\Aggrid::load($items[$delta]->aggrid_id);
$aggridEntity = Aggrid::load($items[$delta]->aggrid_id);
$aggridDefault = json_decode($aggridEntity->get('aggridDefault'));
if (empty($items[$delta]->value) || $items[$delta]->value == '{}') {
......
......@@ -2,6 +2,7 @@
namespace Drupal\aggrid\Plugin\Field\FieldWidget;
use Drupal\aggrid\Entity\Aggrid;
use Drupal\aggrid\Entity;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Field\FieldItemListInterface;
......@@ -70,7 +71,7 @@ class AggridWidgetType extends WidgetBase {
}
else {
$aggridEntity = Entity\Aggrid::load($items[$delta]->aggrid_id);
$aggridEntity = Aggrid::load($items[$delta]->aggrid_id);
$aggridDefault = json_decode($aggridEntity->get('aggridDefault'));
if (empty($items[$delta]->value) || $items[$delta]->value == '{}') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment