fix: allow navigate back despite displayFrontPageList

dhis2 · Oct 10, 2024 · 92b302b · 92b302b
1 parent 294a8f2
commit 92b302b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
-"PO-Revision-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-10T14:29:59.249Z\n"
+"PO-Revision-Date: 2024-10-10T14:29:59.249Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1119,6 +1119,9 @@ msgstr "Create new event"
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr "Search for a {{trackedEntityName}} in {{programName}}"
 
+msgid "Back to list"
+msgstr "Back to list"
+
 msgid "No tracked entity types available"
 msgstr "No tracked entity types available"
 

diff --git a/src/core_modules/capture-core/components/Pages/MainPage/MainPage.container.js b/src/core_modules/capture-core/components/Pages/MainPage/MainPage.container.js
@@ -139,7 +139,7 @@ const MainPageContainer = () => {
     }, [showAllAccessible, dispatch]);
 
     useEffect(() => {
-        if (programId && trackedEntityTypeId && displayFrontPageList && selectedTemplateId === undefined) {
+        if (programId && trackedEntityTypeId && selectedTemplateId === undefined) {
             if (reduxSelectedTemplateId && workingListProgramId === programId) {
                 handleChangeTemplateUrl({
                     programId,
@@ -150,6 +150,7 @@ const MainPageContainer = () => {
                 });
                 return;
             }
+            if (!displayFrontPageList) return;
             handleChangeTemplateUrl({
                 programId,
                 orgUnitId,