From bfc6d055f89ccec44a215dd31b098110af89a5de Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Mon, 26 Oct 2020 13:57:14 -0700
Subject: [PATCH] Fixed broken efiling

---
 edivorce/apps/core/efilinghub.py       | 17 ++++++++++-------
 edivorce/apps/core/utils/cso_filing.py |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/edivorce/apps/core/efilinghub.py b/edivorce/apps/core/efilinghub.py
index c9e0292d..0b155b10 100644
--- a/edivorce/apps/core/efilinghub.py
+++ b/edivorce/apps/core/efilinghub.py
@@ -231,17 +231,17 @@ class EFilingHub:
             package['filingPackage']['parties'] = parties
         # update return urls
         package['navigationUrls']['error'] = self._get_absolute_url(
-            reverse('dashboard_nav', args=['check_with_registry']))
+            request, reverse('dashboard_nav', args=['check_with_registry']))
         if self.initial_filing:
             package['navigationUrls']['cancel'] = self._get_absolute_url(
-                reverse('dashboard_nav', args=['initial_filing']))
+                request, reverse('dashboard_nav', args=['initial_filing']))
             package['navigationUrls']['success'] = self._get_absolute_url(
-                reverse('after_submit_initial_files'))
+                request, reverse('after_submit_initial_files'))
         else:
             package['navigationUrls']['cancel'] = self._get_absolute_url(
-                reverse('dashboard_nav', args=['final_filing']))
+                request, reverse('dashboard_nav', args=['final_filing']))
             package['navigationUrls']['success'] = self._get_absolute_url(
-                reverse('after_submit_final_files'))
+                request, reverse('after_submit_final_files'))
 
         return package
 
@@ -364,8 +364,11 @@ class EFilingHub:
 
         return d
 
-    def _get_absolute_url(self, path):
-        return settings.PROXY_BASE_URL + path
+    def _get_absolute_url(self, request, path):
+        if settings.PROXY_BASE_URL:
+            return settings.PROXY_BASE_URL + path
+        else:
+            return request.get_host() + path
 
     # -- EFILING HUB INTERFACE --
     def get_files(self, request, responses, uploaded, generated):
diff --git a/edivorce/apps/core/utils/cso_filing.py b/edivorce/apps/core/utils/cso_filing.py
index e5c95f90..ff97b6c4 100644
--- a/edivorce/apps/core/utils/cso_filing.py
+++ b/edivorce/apps/core/utils/cso_filing.py
@@ -38,7 +38,7 @@ def file_documents(request, responses, initial=False):
 
     redirect_url, msg = hub.upload(request, post_files, documents, parties, location)
 
-    if msg:
+    if msg != 'success':
         errors.append(msg)
         return errors, None