Fix determining current app

cms/toolbar/toolbar.py

@@ -77,7 +77,10 @@ def __init__(self, request):
             self.clipboard = user_settings.clipboard
         with force_language(self.language):
             try:
-                self.app_name = resolve(self.request.path).app_name
+                self.app_name = resolve(self.request.path).func.func_closure[0].cell_contents.__module__
+            except (TypeError, AttributeError):
+                # No decorator for the current view
+                self.app_name = resolve(self.request.path).func.__module__
             except Resolver404:
                 self.app_name = ""
         toolbars = toolbar_pool.get_toolbars()
@@ -86,7 +89,9 @@ def __init__(self, request):
         app_key = ''
         for key in toolbars:
             app_name = ".".join(key.split(".")[:-2])
-            if app_name == self.app_name and len(key) > len(app_key):
+            if (self.app_name and app_name and
+                    self.app_name.startswith(app_name) and
+                    len(key) > len(app_key)):
                 app_key = key
         for key in toolbars:
             toolbar = toolbars[key](self.request, self, key == app_key, app_key)