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.

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

Next #2094

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft

Next #2094

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1b405c1
Integrate Web Components (#2032)
cairocoder01 Apr 13, 2023
6a6728e
implements dt-single-select and dt-date (#2044)
micahmills Apr 25, 2023
144e825
Merge 1.40.0 into next (#2060)
cairocoder01 May 5, 2023
623a6ad
implement dt-tags (#2059)
cairocoder01 May 5, 2023
77b3320
Implement dt-connection (#2061)
cairocoder01 May 8, 2023
ff7fc79
implements dt_multi_select (#2065)
micahmills May 15, 2023
f87febc
Merge branch 'master' into next
corsacca Aug 29, 2023
b940bdf
Update components to 0.5.1
corsacca Aug 30, 2023
fd0b612
Missing files.
corsacca Aug 30, 2023
480420a
Merge branch 'master' into next
corsacca Nov 15, 2023
21e14b0
Merge branch 'master' into next
corsacca Dec 13, 2023
1a0b3e6
Merge branch 'master' into next
corsacca Jan 12, 2024
ab21565
Merge branch 'develop' into next
corsacca Mar 25, 2024
dcfa4a9
Merge branch 'refs/heads/develop' into next
corsacca May 22, 2024
d0bbd48
Run prettier and ignore components
corsacca May 22, 2024
868e24d
Web components integration into new contact form (#2450)
Ashima-Arora May 23, 2024
d15d41a
Make private contacts an opt-in feature for new instances. Connection…
corsacca May 23, 2024
6ab0384
Update README.md
squigglybob May 23, 2024
d4e59f1
Update README.md
squigglybob May 23, 2024
f796bc0
Update README.md
squigglybob May 23, 2024
1c375cf
fix migration
corsacca May 23, 2024
e3beb1a
Handle undefined warning
corsacca May 25, 2024
af0d9b4
moves component services to header
micahmills May 28, 2024
f3b4c1f
Update email template button hover color to green
corsacca May 29, 2024
65b87a3
Metrics > Personal > Add Gen-Mapper (#2483)
kodinkat May 29, 2024
ec8f406
Customizations > enable creation of location fields (grid only) (#2499)
kodinkat May 29, 2024
bc79c0e
Create dt_site_id function (#2489)
corsacca May 29, 2024
faa87eb
Move location fields to the custom post type base (#2501)
kodinkat May 29, 2024
8f834e2
Login SSO: Try to match firebase languages
corsacca May 30, 2024
add696e
change CI to use php8.3 (#2511)
corsacca May 31, 2024
8dd0be8
phpcs
corsacca May 31, 2024
38d0ed1
Refactor Settings D.T > Custom Lists > Languages (#2509)
CptHappyHands May 31, 2024
da44754
Metrics> Maps > fix getting user locations (#2503)
kodinkat Jun 3, 2024
06d3fe2
phpcbf fixes
micahmills Jun 5, 2024
f590336
Merge branch 'upstream-develop' into next
micahmills Jun 5, 2024
949d0b8
Edit page components integration fixing (#2510)
Ashima-Arora Jun 21, 2024
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
Metrics> Maps > fix getting user locations (#2503)
* Removed hardcoding

* Ensure correct db table prefix is used + Confirm user exists on get_user_location

* Additional sql user checks

* Ensure removed multisite user locations are not displayed
  • Loading branch information
kodinkat committed Jun 3, 2024
commit da44754b0904f3e469f1d6dde6e2e41c0aeddbb9
5 changes: 3 additions & 2 deletions dt-mapping/mapping-queries.php
Original file line number Diff line number Diff line change
Expand Up @@ -1317,10 +1317,11 @@ public static function post_type_geojson( $post_type, $args = [], $offset = 0, $
SELECT u.display_name AS name, um.meta_value AS post_id, lgm.lng, lgm.lat
FROM $wpdb->dt_location_grid_meta AS lgm
JOIN $wpdb->users AS u ON ( u.ID = lgm.post_id )
LEFT JOIN wp_usermeta AS um ON ( u.ID = um.user_id AND um.meta_key = 'wp_corresponds_to_contact' )
LEFT JOIN $wpdb->usermeta AS um ON ( u.ID = um.user_id AND um.meta_key = %s )
INNER JOIN $wpdb->usermeta AS um_cap ON ( u.ID = um_cap.user_id AND um_cap.meta_key = %s )
WHERE lgm.post_type = %s
LIMIT %d, %d;
", 'users', $offset, $limit );
", ( $wpdb->prefix . 'corresponds_to_contact' ), ( $wpdb->prefix . 'capabilities' ), 'users', $offset, $limit );

} else {
$prepared_query = $wpdb->prepare( "
Expand Down
Loading