Skip to content
Snippets Groups Projects
Commit 6987e4d6 authored by Amine's avatar Amine
Browse files

Apply patches + code format.

parent bda410b4
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,8 @@ use Drupal\Component\Annotation\Plugin;
*
* @Annotation
*/
class ExternalDataSource extends Plugin {
class ExternalDataSource extends Plugin
{
/**
* The plugin ID.
......
......@@ -10,19 +10,21 @@ use Drupal\Core\Controller\ControllerBase;
*
* @package Drupal\external_data_source\Controller
*/
class AccessController extends ControllerBase {
class AccessController extends ControllerBase
{
/**
* Checks access.
*
* @author Amine Cherif <maccherif2001@gmail.com>
* Prevent the external use of autocomplete so only a connected user can use
* it
* @return \Drupal\Core\Access\AccessResultInterface
* The access result.
*/
public function access() {
return AccessResult::allowedIf(!\Drupal::currentUser()->isAnonymous());
}
/**
* Checks access.
*
* @author Amine Cherif <maccherif2001@gmail.com>
* Prevent the external use of autocomplete so only a connected user can use
* it
* @return \Drupal\Core\Access\AccessResultInterface
* The access result.
*/
public function access()
{
return AccessResult::allowedIf(!\Drupal::currentUser()->isAnonymous());
}
}
......@@ -17,7 +17,8 @@ use Masterminds\HTML5\Parser\UTF8Utils;
/**
* Class ExternalDataSourceController.
*/
class ExternalDataSourceController extends ControllerBase {
class ExternalDataSourceController extends ControllerBase
{
/**
* Drupal\external_data_source\Plugin\ExternalDataSourceManager definition.
......@@ -28,18 +29,20 @@ class ExternalDataSourceController extends ControllerBase {
/**
* Constructs a new AutoCompleteController object.
* @param ExternalDataSourceManager $plugin_manager_external_ws_source)
* @param ExternalDataSourceManager $plugin_manager_external_ws_source )
*/
public function __construct(ExternalDataSourceManager $plugin_manager_external_ws_source) {
public function __construct(ExternalDataSourceManager $plugin_manager_external_ws_source)
{
$this->pluginManagerExternalWsSource = $plugin_manager_external_ws_source;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
public static function create(ContainerInterface $container)
{
return new static(
$container->get('plugin.manager.external_data_source')
$container->get('plugin.manager.external_data_source')
);
}
......@@ -48,7 +51,8 @@ class ExternalDataSourceController extends ControllerBase {
* @param Request $request
* @return JsonResponse $response
*/
public function autocomplete(Request $request) {
public function autocomplete(Request $request)
{
$requestedPlugin = $request->query->get('plugin_name');
$type = \Drupal::service('plugin.manager.external_data_source');
$plugin_definitions = $type->getDefinitions();
......@@ -56,7 +60,7 @@ class ExternalDataSourceController extends ControllerBase {
if (count($plugin_definitions)) {
foreach ($plugin_definitions as $plugin) {
$plugins[$plugin['id']] = $plugin['name']->__toString()
. ' - ' . $plugin['description']->__toString();
. ' - ' . $plugin['description']->__toString();
}
}
if (!array_key_exists($requestedPlugin, $plugins)) {
......@@ -74,12 +78,13 @@ class ExternalDataSourceController extends ControllerBase {
* inside a checkbox or select field
* @return array
*/
public function optionsForSelect($pluginInstance) {
public function optionsForSelect($pluginInstance)
{
$response = $pluginInstance->getResponse();
$stringCleaner = new UTF8Utils();
$options = [];
foreach ($response as $key => $value) {
$options[$stringCleaner::convertToUTF8($value['label'])] = $stringCleaner::convertToUTF8($value['value']);
$options[$stringCleaner::convertToUTF8($value['value'])] = $stringCleaner::convertToUTF8($value['label']);
}
return $options;
}
......
......@@ -31,7 +31,7 @@ class ExternalDataSource extends FieldItemBase {
public static function defaultStorageSettings() {
return [
'max_length' => 255,
'ws' => 'poles', //Default ws
'ws' => 'countries', //Default ws
'count' => 10, //Default default number of results
'is_ascii' => FALSE,
'case_sensitive' => FALSE,
......
......@@ -100,7 +100,7 @@ class ExternalDataSourceSelectWidget extends WidgetBase implements ContainerFact
//retrieve settings from field Storage
$fieldSettings = $this->getFieldSettings();
//Default plugin to prevent exceptions
$plugin = 'poles';
$plugin = 'countries';
//Chosen plugin in settings
if (!empty($fieldSettings['ws'])) {
$SettingPlugin = $fieldSettings['ws'];
......@@ -121,9 +121,7 @@ class ExternalDataSourceSelectWidget extends WidgetBase implements ContainerFact
$handler = new ExternalDataSourceController(\Drupal::service('plugin.manager.external_data_source'));
$element['value'] = $element + [
'#type' => 'select',
'#options' => array_merge(
['' => t('None')], $handler->optionsForSelect($pluginInstance)
),
'#options' => ['' => t('None')] + $handler->optionsForSelect($pluginInstance),
'#attributes' => ['class' => ['input-lg', 'form-control']],
'#default_value' => isset($items[$delta]->value) ? $items[$delta]->value : '',
'#size' => $this->getSetting('size'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment