Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature implementation for #1471 #1472

Merged
merged 18 commits into from
Aug 9, 2021
Merged

Feature implementation for #1471 #1472

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0eceb81
This changeset implements a way to determine the mapping version
tott Aug 28, 2019
3c2000f
Fix phpcs errors
tott Aug 28, 2019
4ba7964
Moving mapping determination to function for consistency
tott Aug 29, 2019
845d7ff
Fix notice
tott Aug 29, 2019
4ac7e06
Add and adjust unit tests for proper execution and add required filte…
tott Aug 31, 2019
f9061ed
Merge branch 'develop' into feature/validate-mapping
oscarssanchez Sep 28, 2019
7ee7418
Solve phpcs issues
oscarssanchez Sep 28, 2019
383169a
Check $dismiss to see if notice has already been dismissed
asharirfan Jan 18, 2020
8ba02e3
Merge branch 'develop' into feature/validate-mapping
asharirfan Jan 18, 2020
c392c02
Merge branch 'develop' into feature/validate-mapping
oscarssanchez Jul 19, 2021
8f4dce7
Correct admin natoice
oscarssanchez Jul 27, 2021
f3ef9d0
Add space
oscarssanchez Jul 27, 2021
b5b9aeb
Merge branch 'develop' into feature/validate-mapping
felipeelia Aug 1, 2021
d4bd752
Docs + move determine_mapping_version
felipeelia Aug 1, 2021
03599ac
Fix PHP Unit tests
felipeelia Aug 1, 2021
3e52fc2
Another attempt to fix PHP Unit tests
felipeelia Aug 1, 2021
6cead72
Merge branch 'develop' into feature/validate-mapping
felipeelia Aug 2, 2021
2e037af
Merge branch 'develop' into feature/validate-mapping
oscarssanchez Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix notice
  • Loading branch information
@tott
tott committed Aug 29, 2019
commit 845d7ff5d979d8b7ffc3de18c93eed200310ff7b
16 changes: 13 additions & 3 deletions includes/classes/AdminNotices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,24 +584,34 @@ protected function process_host_error_notice() {
* @return array|bool
*/
protected function process_maybe_wrong_mapping_notice() {
// we might have this dismissed
if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
$dismiss = get_site_option( 'ep_hide_maybe_wrong_mapping_notice', false );
oscarssanchez marked this conversation as resolved.
Show resolved Hide resolved
} else {
$dismiss = get_option( 'ep_hide_maybe_wrong_mapping_notice', false );
}

// we need a host
$host = Utils\get_host();
if ( empty( $host ) ) {
return false;
}

// we also need a version
$es_version = Elasticsearch::factory()->get_elasticsearch_version( false );

if ( false == $es_version ) {
return false;
}

// we also likely need a sync to have a mapping
if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
$dismiss = get_site_option( 'ep_hide_maybe_wrong_mapping_notice', false );
$last_sync = get_site_option( 'ep_last_sync', false );
} else {
$dismiss = get_option( 'ep_hide_maybe_wrong_mapping_notice', false );
$last_sync = get_option( 'ep_last_sync', false );
}

if ( $dismiss == $es_version ) {
if ( empty( $last_sync ) ) {
return false;
}

Expand Down