Skip to content

#2443 - Metrics - Gen-Mapper Multiplier Version Of The Dynamic Metrics #2483

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

Merged
merged 9 commits into from
May 29, 2024
Merged

#2443 - Metrics - Gen-Mapper Multiplier Version Of The Dynamic Metrics #2483

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf30fd3
Support using of dynamic gen-map within multiplier personal section
kodinkat May 20, 2024
5080c96
Merge branch 'develop' of https://github.com/DiscipleTools/disciple-t…
kodinkat May 21, 2024
5aedf5b
Obfuscate non-shared item records
kodinkat May 21, 2024
ec79192
Ensure non-shared generations are removed + Additional security
kodinkat May 22, 2024
71c8dae
Merge branch 'develop' of https://github.com/DiscipleTools/disciple-t…
kodinkat May 24, 2024
cbb1aaf
Displayed within both personal and dynamic metrics sections for admin…
kodinkat May 24, 2024
cab1781
Ensure all user roles have personal metrics access to gen-map
kodinkat May 28, 2024
b7a5297
Ensure correct side menu option is selected
kodinkat May 28, 2024
e1955c6
Update Title
corsacca May 29, 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
11 changes: 5 additions & 6 deletions dt-metrics/metrics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ public function __construct(){
add_action( 'after_setup_theme', function (){
$modules = dt_get_option( 'dt_post_type_modules' );

if ( dt_has_permissions( [ 'multiplier' ] ) ) {
/* Record Types */
$genmap_base_slug = 'personal';
$genmap_base_title = __( 'Personal', 'disciple_tools' );
require_once( get_template_directory() . '/dt-metrics/records/genmap.php' );
require_once( get_template_directory() . '/dt-metrics/records/genmap.php' );

if ( dt_has_permissions( [ 'multiplier' ] ) || dt_has_permissions( [ 'dt_all_access_contacts', 'view_project_metrics' ] ) ) {
new DT_Metrics_Groups_Genmap( 'personal', __( 'Personal', 'disciple_tools' ) );
}

// Personal
Expand Down Expand Up @@ -84,7 +83,7 @@ public function __construct(){
require_once( get_template_directory() . '/dt-metrics/combined/hover-map.php' );

/* Record Types */
require_once( get_template_directory() . '/dt-metrics/records/genmap.php' );
new DT_Metrics_Groups_Genmap( 'records', __( 'Genmap', 'disciple_tools' ) );
require_once( get_template_directory() . '/dt-metrics/records/dynamic-records-map.php' );
}
if ( !empty( $modules['access_module']['enabled'] ) ){
Expand Down
7 changes: 0 additions & 7 deletions dt-metrics/records/genmap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,3 @@ public function exclude_non_shared_generations( $children ): array {
}
}

if ( isset( $genmap_base_slug, $genmap_base_title ) ) {
new DT_Metrics_Groups_Genmap( $genmap_base_slug, $genmap_base_title );

} else {
new DT_Metrics_Groups_Genmap( 'records', __( 'Genmap', 'disciple_tools' ) );
}

Loading