upgraded core, fixed customs modules
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
name: 'Editors Menus'
|
||||
type: module
|
||||
description: 'create editors admin menus through module as they will be exportable as config'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'Custom'
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: 'images_styles_cron_gen'
|
||||
type: module
|
||||
description: 'helpers for progressive decoupling'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'custom'
|
||||
# https://www.flocondetoile.fr/blog/generate-programmatically-image-styles-drupal-8
|
||||
# https://www.flocondetoile.fr/blog/using-drupal-8-cron-api-generate-image-styles
|
||||
|
@@ -3,7 +3,7 @@ description: Materio commerce custom module
|
||||
package: Materio
|
||||
|
||||
type: module
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
|
||||
dependencies:
|
||||
- drupal:commerce
|
@@ -1,5 +1,5 @@
|
||||
name: 'materio_decoupled'
|
||||
type: module
|
||||
description: 'helpers for progressive decoupling'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'Materio'
|
||||
|
@@ -21,7 +21,7 @@ class AjaxHeaderMenuBlock extends ControllerBase {
|
||||
// \Drupal::logger('materio_user')->notice($language);
|
||||
$this->bid = "header";
|
||||
$this->block = Block::load($this->bid);
|
||||
$this->block_builded = \Drupal::entityManager()->getViewBuilder('block')->view($this->block);
|
||||
$this->block_builded = \Drupal::entityTypeManager()->getViewBuilder('block')->view($this->block);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -1,5 +1,5 @@
|
||||
name: 'materio_expo'
|
||||
type: module
|
||||
description: 'My Awesome Module'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'Materio'
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: Materio FLAG
|
||||
type: module
|
||||
description: Defines api behaviours for flaglist.
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: Materio
|
||||
dependencies:
|
||||
- drupal:flag_lists
|
||||
|
@@ -2,8 +2,7 @@ name: Materio GraphQL
|
||||
type: module
|
||||
description: 'Materio GraphQL schema.'
|
||||
package: Materio
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
dependencies:
|
||||
- graphql:graphql
|
||||
- node:node
|
||||
core_version_requirement: ^8 || ^9
|
||||
|
@@ -1,6 +1,6 @@
|
||||
name: Materio Home
|
||||
type: module
|
||||
description: Defines home contents for materiO.
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: Materio
|
||||
dependencies:
|
||||
|
@@ -4,7 +4,6 @@ namespace Drupal\materio_home\Controller;
|
||||
|
||||
use Drupal\Core\Controller\ControllerBase;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Drupal\Core\Entity\EntityManagerInterface;
|
||||
use Drupal\language\ConfigurableLanguageManagerInterface;
|
||||
use Drupal\Core\Render\RendererInterface;
|
||||
use Drupal\Core\Entity\EntityTypeManagerInterface;
|
||||
@@ -19,12 +18,6 @@ use Drupal\core\render\RenderContext;
|
||||
*/
|
||||
class AjaxHomeController extends ControllerBase {
|
||||
|
||||
/**
|
||||
* Drupal\Core\Entity\EntityManagerInterface definition.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityManagerInterface
|
||||
*/
|
||||
protected $entityManager;
|
||||
/**
|
||||
* Drupal\language\ConfigurableLanguageManagerInterface definition.
|
||||
*
|
||||
@@ -47,8 +40,7 @@ class AjaxHomeController extends ControllerBase {
|
||||
/**
|
||||
* Constructs a new AjaxHomeController object.
|
||||
*/
|
||||
public function __construct(EntityManagerInterface $entity_manager, ConfigurableLanguageManagerInterface $language_manager, RendererInterface $renderer, EntityTypeManagerInterface $entity_type_manager) {
|
||||
$this->entityManager = $entity_manager;
|
||||
public function __construct(ConfigurableLanguageManagerInterface $language_manager, RendererInterface $renderer, EntityTypeManagerInterface $entity_type_manager) {
|
||||
$this->languageManager = $language_manager;
|
||||
$this->renderer = $renderer;
|
||||
$this->entityTypeManager = $entity_type_manager;
|
||||
@@ -59,7 +51,6 @@ class AjaxHomeController extends ControllerBase {
|
||||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('entity.manager'),
|
||||
$container->get('language_manager'),
|
||||
$container->get('renderer'),
|
||||
$container->get('entity_type.manager')
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: Materio Id
|
||||
type: module
|
||||
description: "Compute automaticly materials references : <family>-<index>, eg. W-0459."
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: Materio
|
||||
dependencies:
|
||||
- computed_field
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: Materio JsonAPI
|
||||
type: module
|
||||
description: Defines custom behaviours to jsonapi.
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: Materio
|
||||
dependencies:
|
||||
- drupal:jsonapi
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: Materio Migration
|
||||
type: module
|
||||
description: Defines custom migration for materio (from d7 to d8).
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: Materio
|
||||
dependencies:
|
||||
# - config_devel
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: Materio Samples
|
||||
type: module
|
||||
description: "Provide a sample field, each showroom (taxonomy term) can fill it's own sample reference, and only it's own"
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: Materio
|
||||
dependencies:
|
||||
- taxonomy
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: Materio Serach API
|
||||
type: module
|
||||
description: 'Search Api Materio module'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'Materio'
|
||||
dependencies:
|
||||
- search_api
|
||||
|
@@ -260,7 +260,7 @@ class Base extends ControllerBase {
|
||||
// Get the typed string from the URL, if it exists.
|
||||
$this->keys = $request->query->get('keys');
|
||||
if($this->keys){
|
||||
$this->keys = Unicode::strtolower($this->keys);
|
||||
$this->keys = mb_strtolower($this->keys);
|
||||
// $this->keys = Tags::explode($this->keys);
|
||||
\Drupal::logger('materio_sapi')->notice($this->keys);
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
name: Materio Simple News
|
||||
type: module
|
||||
description: 'Simple News extensions Materio module'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'Materio'
|
||||
dependencies:
|
||||
- simplenews
|
||||
|
@@ -1,5 +1,5 @@
|
||||
name: 'materio_user'
|
||||
type: module
|
||||
description: ''
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'Materio'
|
||||
|
@@ -9,7 +9,7 @@ use \Drupal\Core\Form\FormStateInterface;
|
||||
use \Drupal\Core\Block\BlockPluginInterface;
|
||||
use \Drupal\Core\Url;
|
||||
use \Drupal\Core\Link;
|
||||
|
||||
use \Drupal\materio_user\MaterioUserLoginBlockAlterRender;
|
||||
/**
|
||||
* implements hook_form_FORM_ID_alter()
|
||||
*
|
||||
@@ -121,10 +121,12 @@ function _materio_user_process_password_confirm($element){
|
||||
/**
|
||||
* implements hook_block_view_BASE_BLOCK_ID_alter()
|
||||
*
|
||||
* https://www.drupal.org/project/drupal/issues/2626224
|
||||
* OLD D8 https://www.drupal.org/project/drupal/issues/2626224
|
||||
* NEW D9 https://www.drupal.org/node/2966725
|
||||
*/
|
||||
function materio_user_block_view_user_login_block_alter(array &$build, BlockPluginInterface $block) {
|
||||
$build['#pre_render'][] = '_materio_user_user_login_block_pre_render';
|
||||
// $build['#pre_render'][] = '_materio_user_user_login_block_pre_render';
|
||||
$build['#pre_render'][] = [MaterioUserLoginBlockAlterRender::class, 'preRender'];
|
||||
}
|
||||
|
||||
function _materio_user_user_login_block_pre_render(array $build){
|
||||
|
@@ -21,7 +21,7 @@ class AjaxLoginBlock extends ControllerBase {
|
||||
// \Drupal::logger('materio_user')->notice($language);
|
||||
$this->bid = "userlogin";
|
||||
$this->block = Block::load($this->bid);
|
||||
$this->block_builded = \Drupal::entityManager()->getViewBuilder('block')->view($this->block);
|
||||
$this->block_builded = \Drupal::entityTypeManager()->getViewBuilder('block')->view($this->block);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\materio_user;
|
||||
|
||||
use Drupal\Core\Security\TrustedCallbackInterface;
|
||||
|
||||
/**
|
||||
* Provides a trusted callback to alter the commerce cart block.
|
||||
*
|
||||
* @see olla_common_block_view_commerce_cart_alter()
|
||||
*/
|
||||
class MaterioUserLoginBlockAlterRender implements TrustedCallbackInterface {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function trustedCallbacks() {
|
||||
return ['preRender'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets - #pre_render callback.
|
||||
*/
|
||||
public static function preRender($build) {
|
||||
$user_links = &$build['content']['user_links'];
|
||||
$items = &$user_links['#items'];
|
||||
|
||||
unset($items['create_account']);
|
||||
// $items['create_account']['#url']->mergeOptions(array(
|
||||
// "attributes" => array(
|
||||
// "@click.prevent" => "create_account"
|
||||
// )
|
||||
// ));
|
||||
|
||||
// Do not handle passward reset with vue
|
||||
// $items['request_password']['#url']->mergeOptions(array(
|
||||
// 'attributes' => array(
|
||||
// "@click.prevent" => "request_password"
|
||||
// )
|
||||
// ));
|
||||
return $build;
|
||||
}
|
||||
|
||||
}
|
@@ -1,7 +1,7 @@
|
||||
name: 'REST Config'
|
||||
type: module
|
||||
description: 'Get site configiration through rest api'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8.8 || ^9.2
|
||||
package: 'Custom'
|
||||
dependencies:
|
||||
- rest
|
||||
|
@@ -1,7 +1,6 @@
|
||||
name: Vue Link Formatter
|
||||
type: module
|
||||
description: 'Provides a simple vue link field formatter with vue attributes as @click.'
|
||||
core: 8.x
|
||||
core_version_requirement: ^8 || ^9
|
||||
package: Fields
|
||||
# version: VERSION
|
||||
|
Reference in New Issue
Block a user