L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-69906-39-searchsimpledb' of git://github.com/mudrd8mz/moodle into MOODLE_39_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-10-19 22:56:40 +02:00
parent ccbd35915c 834a1d64c5
commit 2b169e9b31
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+8 -4
View File
@@ -11021,7 +11021,7 @@ class admin_setting_searchsetupinfo extends admin_setting {
* @return string
*/
public function output_html($data, $query='') {
global $CFG, $OUTPUT;
global $CFG, $OUTPUT, $ADMIN;
$return = '';
$brtag = html_writer::empty_tag('br');
@@ -11083,9 +11083,13 @@ class admin_setting_searchsetupinfo extends admin_setting {
$row[0] = '3. ' . get_string('setupsearchengine', 'admin');
$row[1] = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
} else {
$url = new moodle_url('/admin/settings.php?section=search' . $CFG->searchengine);
$row[0] = '3. ' . html_writer::tag('a', get_string('setupsearchengine', 'admin'),
array('href' => $url));
if ($ADMIN->locate('search' . $CFG->searchengine)) {
$url = new moodle_url('/admin/settings.php?section=search' . $CFG->searchengine);
$row[0] = '3. ' . html_writer::link($url, get_string('setupsearchengine', 'core_admin'));
} else {
$row[0] = '3. ' . get_string('setupsearchengine', 'core_admin');
}
// Check the engine status.
$searchengine = \core_search\manager::search_engine_instance();
try {
search/tests/behat/setup_search_engine.feature
+22
View File
@@ -0,0 +1,22 @@
@core @core_search
Feature: Plugins > Search > Search setup contains Setup search engine only if the target section actually exists
In order to set up the selected search engine
As an admin
I need to be able to click the link 'Setup search engine' but only if the target section actually exists
Scenario: Selected search engine has an admin section
Given the following config values are set as admin:
| enableglobalsearch | 1 |
| searchengine | solr |
And I log in as "admin"
When I navigate to "Plugins > Search" in site administration
Then "Setup search engine" "link" should exist
Scenario: Selected search engine does not have an admin section
Given the following config values are set as admin:
| enableglobalsearch | 1 |
| searchengine | simpledb |
And I log in as "admin"
When I navigate to "Plugins > Search" in site administration
Then I should see "Setup search engine"
And "Setup search engine" "link" should not exist