rnsrk/boehler_advanced_search
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed the module's machine name from islandora_advanced_search to `advanced_search

Browse source
This commit is contained in:
Kyle Huynh 2021-12-09 10:06:25 -05:00
parent c210ee062c
commit a3cca6bc37
36 changed files with 130 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Form/AdvancedSearchForm.php
View file

@ -1,15 +1,15 @@
<?php
namespace Drupal\islandora_advanced_search\Form;
namespace Drupal\advanced_search\Form;
use Drupal\Component\Utility\Html;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\islandora_advanced_search\AdvancedSearchQuery;
use Drupal\islandora_advanced_search\AdvancedSearchQueryTerm;
use Drupal\islandora_advanced_search\GetConfigTrait;
use Drupal\advanced_search\AdvancedSearchQuery;
use Drupal\advanced_search\AdvancedSearchQueryTerm;
use Drupal\advanced_search\GetConfigTrait;
use Drupal\views\DisplayPluginCollection;
use Drupal\views\Entity\View;
use Drupal\views\Plugin\views\display\PathPluginBase;
@ -36,7 +36,7 @@ class AdvancedSearchForm extends FormBase {
const NOT_OP = 'NOT';
const OR_OP = 'OR';
// These are also hard-coded in islandora_advanced_search.form.js.
// These are also hard-coded in advanced_search.form.js.
const CONJUNCTION_FORM_FIELD = 'conjunction';
const SEARCH_FORM_FIELD = 'search';
const INCLUDE_FORM_FIELD = 'include';
@ -80,7 +80,7 @@ class AdvancedSearchForm extends FormBase {
* {@inheritdoc}
*/
public function getFormId() {
return 'islandora_advanced_search_form';
return 'advanced_search_form';
}
/**
@ -249,8 +249,8 @@ class AdvancedSearchForm extends FormBase {
$route_name = $this->getRouteName($form_state);
$requires_redirect = $route_name ? $this->currentRouteMatch->getRouteName() !== $route_name : FALSE;
$form['#attached']['library'][] = 'islandora_advanced_search/advanced.search.form';
$form['#attached']['drupalSettings']['islandora_advanced_search_form'] = [
$form['#attached']['library'][] = 'advanced_search/advanced.search.form';
$form['#attached']['drupalSettings']['advanced_search_form'] = [
'id' => Html::getId($this->getFormId()),
'redirect' => $requires_redirect,
'query_parameter' => AdvancedSearchQuery::getQueryParameter(),

2
src/Form/SearchForm.php
View file

@ -1,6 +1,6 @@
<?php
namespace Drupal\islandora_advanced_search\Form;
namespace Drupal\advanced_search\Form;
use Drupal\Core\Form\FormBase;

10
src/Form/SettingsForm.php
View file

@ -1,12 +1,12 @@
<?php
namespace Drupal\islandora_advanced_search\Form;
namespace Drupal\advanced_search\Form;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\islandora_advanced_search\AdvancedSearchQuery;
use Drupal\islandora_advanced_search\GetConfigTrait;
use Drupal\advanced_search\AdvancedSearchQuery;
use Drupal\advanced_search\GetConfigTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@ -16,7 +16,7 @@ class SettingsForm extends ConfigFormBase {
use GetConfigTrait;
const CONFIG_NAME = 'islandora_advanced_search.settings';
const CONFIG_NAME = 'advanced_search.settings';
const SEARCH_QUERY_PARAMETER = 'search_query_parameter';
const SEARCH_RECURSIVE_PARAMETER = 'search_recursive_parameter';
const SEARCH_ADD_OPERATOR = 'search_add_operator';
@ -47,7 +47,7 @@ class SettingsForm extends ConfigFormBase {
* {@inheritdoc}
*/
public function getFormId() {
return 'islandora_advanced_search_settings_form';
return 'advanced_search_settings_form';
}
/**