This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/Form/MenuExportForm.php b/src/Form/MenuExportForm.php | |
| index 2b9a2ac..04a3bb4 100644 | |
| --- a/src/Form/MenuExportForm.php | |
| +++ b/src/Form/MenuExportForm.php | |
| @@ -6,6 +6,8 @@ use Drupal\menu_link_content\Entity\MenuLinkContent; | |
| use Drupal\Core\Form\ConfigFormBase; | |
| use Drupal\Core\Form\FormStateInterface; | |
| use \Drupal\system\Entity\Menu; | |
| +use Drupal\Core\Url; | |
| +use Drupal\path_alias\Entity\PathAlias; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php b/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php | |
| index 3ece971..45fb789 100644 | |
| --- a/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php | |
| +++ b/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php | |
| @@ -116,7 +116,7 @@ class OrderItemDiscountAdjustment extends CommercePrice implements ContainerFact | |
| // Find all price components on the order, not the line item, that are not | |
| // a shipping type and not also in the line item price components. | |
| - $order_components = $row->getSourceProperty('order_components/0/data/components'); | |
| + $order_components = $row->getSourceProperty('order_components/0/data/components') ?? []; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/js/fullcalendar_view.js b/js/fullcalendar_view.js | |
| index b6a6a84..977649b 100644 | |
| --- a/js/fullcalendar_view.js | |
| +++ b/js/fullcalendar_view.js | |
| @@ -54,7 +54,7 @@ | |
| // Show Tooltip on Mousehover | |
| let thisEvent = info.event; | |
| let des = thisEvent.extendedProps.des; | |
| - let title = thisEvent.title; | |
| + let title = thisEvent.extendedProps.regular_title; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/inline_entity_form.module b/inline_entity_form.module | |
| index 8f6b69d90fb978e6e5759b70b5a55b6bd70beee4..fcc973e1dc3c2dfc8200cf5b2711f61e4518b592 100644 | |
| --- a/inline_entity_form.module | |
| +++ b/inline_entity_form.module | |
| @@ -476,11 +476,3 @@ function inline_entity_form_migrate_prepare_row(Row $row, MigrateSourceInterface | |
| \Drupal::classResolver(MigrationHelper::class) | |
| ->alterRow($row, $source, $migration); | |
| } | |
| - | |
| -/** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php | |
| index 9aa8168f08..7670fbd895 100644 | |
| --- a/core/modules/views/src/Plugin/views/filter/Date.php | |
| +++ b/core/modules/views/src/Plugin/views/filter/Date.php | |
| @@ -13,37 +13,52 @@ | |
| */ | |
| class Date extends NumericFilter { | |
| - protected function defineOptions() { | |
| - $options = parent::defineOptions(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/js/fullcalendar_view.js b/js/fullcalendar_view.js | |
| index 35ad731..500fbfc 100644 | |
| --- a/js/fullcalendar_view.js | |
| +++ b/js/fullcalendar_view.js | |
| @@ -35,7 +35,7 @@ | |
| // Show Tooltip on Mousehover | |
| let thisEvent = info.event; | |
| let des = thisEvent.extendedProps.des; | |
| - let title = thisEvent.title; | |
| + let title = thisEvent.extendedProps.regular_title; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/commerce_license.module b/commerce_license.module | |
| index 918daaf..610dd84 100644 | |
| --- a/commerce_license.module | |
| +++ b/commerce_license.module | |
| @@ -71,9 +71,24 @@ function commerce_license_commerce_order_item_delete(EntityInterface $entity) { | |
| return; | |
| } | |
| - // Delete the license. | |
| $license = $entity->license->entity; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/Entity/License.php b/src/Entity/License.php | |
| index 6e18a95..e160a43 100644 | |
| --- a/src/Entity/License.php | |
| +++ b/src/Entity/License.php | |
| @@ -12,6 +12,7 @@ use Drupal\Core\Entity\ContentEntityBase; | |
| use Drupal\Core\Entity\EntityChangedTrait; | |
| use Drupal\Core\Entity\EntityTypeInterface; | |
| use Drupal\Core\StringTranslation\StringTranslationTrait; | |
| +use Drupal\commerce_order\Entity\OrderItemInterface; | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php b/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php | |
| index 35266ae..657573d 100644 | |
| --- a/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php | |
| +++ b/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php | |
| @@ -26,6 +26,11 @@ class FieldGroup extends DestinationBase { | |
| $values[$id] = $row->getDestinationProperty($id); | |
| } | |
| + // Fix commerce_order bundle, there is no only one order type. | |
| + if ('commerce_order' == $values['entity_type']) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/js/plugins/drupallink/plugin.js b/js/plugins/drupallink/plugin.js | |
| index b06b276757..c6e0fa676e 100644 | |
| --- a/js/plugins/drupallink/plugin.js | |
| +++ b/js/plugins/drupallink/plugin.js | |
| @@ -208,6 +208,9 @@ | |
| if (!element.isReadOnly()) { | |
| if (element.is('a')) { | |
| + if (!element.hasAttribute( 'data-entity-type' )) { | |
| + return; |