Merge branch 'master' of github.com:jhpyle/docassemble

ktaranek · Oct 15, 2023 · 4e94e98 · 4e94e98
2 parents 52eabc3 + b410e81
commit 4e94e98
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/docassemble_base/docassemble/base/parse.py b/docassemble_base/docassemble/base/parse.py
@@ -2158,6 +2158,7 @@ def __init__(self, orig_data, caller, **kwargs):
                 self.interview.use_tagged_pdf = data['features']['tagged pdf']
             if 'bootstrap theme' in data['features'] and data['features']['bootstrap theme']:
                 self.interview.bootstrap_theme = data['features']['bootstrap theme']
+                self.interview.bootstrap_theme_package = self.package
             if 'inverse navbar' in data['features']:
                 self.interview.options['inverse navbar'] = data['features']['inverse navbar']
             if 'popover trigger' in data['features']:
@@ -7927,7 +7928,10 @@ def standard_ml_store(self):
     def get_bootstrap_theme(self):
         if self.bootstrap_theme is None:
             return None
-        result = docassemble.base.functions.server.url_finder(self.bootstrap_theme, _package=self.source.package)
+        if not hasattr(self, 'bootstrap_theme_package'):
+            result = docassemble.base.functions.server.url_finder(self.bootstrap_theme, _package=self.source.package)
+        else:
+            result = docassemble.base.functions.server.url_finder(self.bootstrap_theme, _package=self.bootstrap_theme_package)
         return result
 
     def get_tags(self, the_user_dict):

diff --git a/docassemble_base/setup.py b/docassemble_base/setup.py
@@ -218,7 +218,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
     "tzlocal==5.0.1",
     "ua-parser==0.18.0",
     "uritemplate==4.1.1",
-    "urllib3==1.26.16",
+    "urllib3==1.26.17",
     "us==3.1.1",
     "user-agents==2.2.0",
     "wcwidth==0.2.6",

diff --git a/docassemble_webapp/setup.py b/docassemble_webapp/setup.py
@@ -259,7 +259,7 @@ def read(fname):
     "tzlocal==5.0.1",
     "ua-parser==0.18.0",
     "uritemplate==4.1.1",
-    "urllib3==1.26.16",
+    "urllib3==1.26.17",
     "us==3.1.1",
     "user-agents==2.2.0",
     "uWSGI==2.0.22",