web/views/boxes.py
changeset 3998 94cc7cad3d2d
parent 3524 a3431f4e2f40
parent 3916 6e7af0e8e524
child 4252 6c4f109c2b03
--- a/web/views/boxes.py	Mon Nov 23 14:13:53 2009 +0100
+++ b/web/views/boxes.py	Thu Dec 03 17:17:43 2009 +0100
@@ -69,7 +69,8 @@
                 else:
                     menu = defaultmenu
                 action.fill_menu(self, menu)
-        if box.is_empty() and not other_menu.is_empty():
+        # if we've nothing but actions in the other_menu, add them directly into the box
+        if box.is_empty() and len(self._menus_by_id) == 1 and not other_menu.is_empty():
             box.items = other_menu.items
             other_menu.items = []
         else: # ensure 'more actions' menu appears last