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

Restrict inactive Dashlet query to Dashlets in the current domain #15283

Merged
merged 4 commits into from
Oct 9, 2019

Conversation

christianwach
Copy link
Member

Overview

Link to the issue on Lab. Ongoing fixes for the CiviCRM Dashboard when using multiple Domains.

Before

When a Contact has a Dashboard in more than one domain, adding a Dashlet to their Dashboard disables all unused Dashlets in all Domains. This resets their Dashboards on other Domains such that they show no active Dashlets at all.

After

When a Contact has a Dashboard in more than one domain, adding a Dashlet to their Dashboard will disable only unused Dashlets in the current Domain. This preserves the Dashlets on the Dashboards on other Domains.

Technical Details

Restricts the query that disables inactive Dashlets to those in the current Domain.

@civibot
Copy link

civibot bot commented Sep 11, 2019

(Standard links)

@civibot civibot bot added the master label Sep 11, 2019
@seamuslee001
Copy link
Contributor

nicely done @christianwach

@christianwach
Copy link
Member Author

@seamuslee001 FWIW, I notice that most of the queries in CRM_Core_BAO_Dashboard are not parameterised (if that's actually a word!) but I assume that's because this file hasn't had any attention for several years.

@seamuslee001
Copy link
Contributor

@christianwach I think your right there

@seamuslee001 seamuslee001 merged commit 64f64d3 into civicrm:master Oct 9, 2019
@christianwach christianwach deleted the lab-1200-3 branch October 9, 2019 13:50
@christianwach
Copy link
Member Author

@seamuslee001 Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants