Merge 78bb3ea into 7df7b4c

openmrs · Aug 24, 2021 · 795b426 · 795b426
2 parents 7df7b4c + 78bb3ea
commit 795b426
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/apps/concepts/pages/ViewConceptPage.tsx b/src/apps/concepts/pages/ViewConceptPage.tsx
@@ -54,6 +54,10 @@ const ViewConceptPage: React.FC<Props> = ({
     retrieveConcept(url);
   }, [url, retrieveConcept]);
 
+  const fromDictionary = linkedDictionary || dictionaryToAddTo;
+  const conceptsDictionary = linkedDictionary ? `${linkedDictionary}concepts/` : `${dictionaryToAddTo}concepts/`; 
+  const backUrl = fromDictionary ? conceptsDictionary : `${conceptSource}concepts/`;
+
   return (
     <>
       <Header
@@ -63,7 +67,7 @@ const ViewConceptPage: React.FC<Props> = ({
             ? concept.display_name
             : "View concept"
         }
-        backUrl={linkedDictionary ? `${linkedDictionary}concepts/` : `${dictionaryToAddTo}concepts/` }
+        backUrl={backUrl}
       >
         <ProgressOverlay
           delayRender