Fixed site selector for contacts

putyourlightson · Oct 6, 2020 · 668edce · 668edce
1 parent a3bc590
commit 668edce
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Fixed
 - Fixed a bug in which the default system from name and email were not parsed when loaded from environment settings ([#176](https://github.com/putyourlightson/craft-campaign/issues/176)).
+- Fixed site selector for contacts ([#177](https://github.com/putyourlightson/craft-campaign/issues/177)).
 
 ### Changed
 - Pending contacts now persist so that verification links remain valid until they are purged ([#169](https://github.com/putyourlightson/craft-campaign/issues/169)).

diff --git a/src/templates/contacts/_layout.html b/src/templates/contacts/_layout.html
@@ -39,7 +39,7 @@
         {% set segment3 = craft.app.request.getSegment(3) ? craft.app.request.getSegment(3) ~ '/' : '' %}
         {% include '_elements/sitemenu' with {
             selectedSiteId: currentSite.id,
-
+            urlFormat: url('campaign/contacts/' ~ segment3 ~ '{handle}'),
         } only %}
     {% endif %}
 

diff --git a/src/templates/reports/_layout.html b/src/templates/reports/_layout.html
@@ -10,7 +10,7 @@
 {% set crumbs = crumbs is defined ? baseCrumbs|merge(crumbs) : [] %}
 
 {% set showSiteMenu = showSiteMenu ?? false %}
-{% set siteId = siteId ?? null %}
+{% set siteId = craft.app.request.getParam('siteId') %}
 
 
 {% block contextMenu %}

diff --git a/src/templates/reports/campaigns/index.html b/src/templates/reports/campaigns/index.html
@@ -6,7 +6,6 @@
 {% set crumbs = [] %}
 
 {% set showSiteMenu = true %}
-{% set siteId = craft.app.request.getParam('siteId') %}
 {% set data = craft.campaign.reports.getCampaignsReportData(siteId) %}
 
 

diff --git a/src/templates/reports/contacts/index.html b/src/templates/reports/contacts/index.html
@@ -5,7 +5,6 @@
 {% set crumbs = [] %}
 
 {% set showSiteMenu = false %}
-{% set siteId = craft.app.request.getParam('siteId') %}
 {% set data = craft.campaign.reports.getContactsReportData() %}
 
 

diff --git a/src/templates/reports/mailinglists/index.html b/src/templates/reports/mailinglists/index.html
@@ -5,7 +5,6 @@
 {% set crumbs = [] %}
 
 {% set showSiteMenu = true %}
-{% set siteId = craft.app.request.getParam('siteId') %}
 {% set data = craft.campaign.reports.getMailingListsReportData(siteId) %}