Merge branch 'fix-keg-0.8.1'

level12 · Nov 8, 2019 · 3f5668d · 3f5668d
2 parents b9b4fb4 + e8248e3
commit 3f5668d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/keg_auth/views.py b/keg_auth/views.py
@@ -34,7 +34,8 @@ class CrudView(keg.web.BaseView):
     @classmethod
     def map_method_route(cls, method_name, route, methods):
         method_route = keg.web.MethodRoute(method_name, route, {'methods': methods},
-                                           cls.calc_url(), cls.calc_endpoint())
+                                           cls.calc_url(use_blueprint=False),
+                                           cls.calc_endpoint(use_blueprint=False))
         mr_options = method_route.options()
         view_func = cls.as_view(method_route.view_func_name,
                                 method_route.sanitized_method_name('_'))
@@ -51,10 +52,20 @@ def init_routes(cls):
                 ex. `cls.map_method_route('read', '/foo', ('GET', ))`"""
         super(CrudView, cls).init_routes()
 
-        cls.map_method_route('add', '{}/add'.format(cls.calc_url()), ('GET', 'POST'))
-        cls.map_method_route('edit', '{}/<int:objid>/edit'.format(cls.calc_url()), ('GET', 'POST'))
-        cls.map_method_route('delete', '{}/<int:objid>/delete'.format(cls.calc_url()), ('GET', ))
-        cls.map_method_route('list', '{}'.format(cls.calc_url()), ('GET', 'POST'))
+        cls.map_method_route('add', '{}/add'.format(cls.calc_url(use_blueprint=False)),
+                             ('GET', 'POST'))
+        cls.map_method_route(
+            'edit',
+            '{}/<int:objid>/edit'.format(cls.calc_url(use_blueprint=False)),
+            ('GET', 'POST')
+        )
+        cls.map_method_route(
+            'delete',
+            '{}/<int:objid>/delete'.format(cls.calc_url(use_blueprint=False)),
+            ('GET', )
+        )
+        cls.map_method_route('list', '{}'.format(cls.calc_url(use_blueprint=False)),
+                             ('GET', 'POST'))
 
     def __init__(self, *args, **kwargs):
         super(CrudView, self).__init__(*args, **kwargs)
@@ -208,7 +219,7 @@ def on_add_edit_failure(self, entity, is_edit):
 
     @classmethod
     def endpoint_for_action(cls, action):
-        return '{}.{}:{}'.format(cls.blueprint.name, cls.calc_endpoint(), case_cw2dash(action))
+        return '{}:{}'.format(cls.calc_endpoint(), case_cw2dash(action))
 
     def make_grid(self):
         grid = self.grid_cls()
@@ -260,7 +271,7 @@ def __init__(self):
         self.responding_method = 'responder'
 
     @classmethod
-    def calc_url(cls):
+    def calc_url(cls, **kwargs):
         authenticator_cls = cls.auth_manager.login_authenticator_cls
         responder_cls = authenticator_cls.responder_cls.get(cls.responder_key)
         return getattr(responder_cls, 'url', None)

diff --git a/setup.py b/setup.py
@@ -35,7 +35,7 @@
         'commonmark',
 
         'Flask-Login',
-        'Keg>=0.8.0',
+        'Keg>=0.8.1',
         'KegElements',
         'inflect',
         'passlib',