more cleanup

conestack · Nov 4, 2024 · 0e44b28 · 0e44b28
1 parent 91b338a
commit 0e44b28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/yafowil/widget/location/__init__.py b/src/yafowil/widget/location/__init__.py
@@ -59,13 +59,15 @@
 resources.add(wr.ScriptResource(
     name='yafowil-location-js',
     directory=os.path.join(resources_dir, 'default'),
+    path='yafowil-location/default',
     depends=['jquery-js', 'leaflet-geosearch-js'],
     resource='widget.js',
     compressed='widget.min.js'
 ))
 resources.add(wr.StyleResource(
     name='yafowil-location-css',
     directory=os.path.join(resources_dir, 'default'),
+    path='yafowil-location/default',
     depends='leaflet-geosearch-css',
     resource='widget.min.css'
 ))
@@ -118,13 +120,15 @@
 bootstrap5_resources.add(wr.ScriptResource(
     name='yafowil-location-js',
     directory=os.path.join(resources_dir, 'bootstrap5'),
+    path='yafowil-location/bootstrap5',
     depends=['jquery-js', 'leaflet-geosearch-js'],
     resource='widget.js',
     compressed='widget.min.js'
 ))
 bootstrap5_resources.add(wr.StyleResource(
     name='yafowil-location-css',
     directory=os.path.join(resources_dir, 'bootstrap5'),
+    path='yafowil-location/bootstrap5',
     depends='leaflet-geosearch-css',
     resource='widget.min.css'
 ))

diff --git a/src/yafowil/widget/location/tests/test_widget.py b/src/yafowil/widget/location/tests/test_widget.py
@@ -316,7 +316,7 @@ def test_resources(self):
         self.assertTrue(os.path.exists(scripts[1].file_path))
 
         self.assertTrue(scripts[2].directory.endswith(np('/location/resources/default')))
-        self.assertEqual(scripts[2].path, 'yafowil-location')
+        self.assertEqual(scripts[2].path, 'yafowil-location/default')
         self.assertEqual(scripts[2].file_name, 'widget.min.js')
         self.assertTrue(os.path.exists(scripts[2].file_path))
 
@@ -338,7 +338,7 @@ def test_resources(self):
         self.assertTrue(os.path.exists(styles[1].file_path))
 
         self.assertTrue(styles[2].directory.endswith(np('/location/resources/default')))
-        self.assertEqual(styles[2].path, 'yafowil-location')
+        self.assertEqual(styles[2].path, 'yafowil-location/default')
         self.assertEqual(styles[2].file_name, 'widget.min.css')
         self.assertTrue(os.path.exists(styles[2].file_path))