web/views/boxes.py
branchstable
changeset 3916 6e7af0e8e524
parent 3511 581de819106f
child 3998 94cc7cad3d2d
child 4212 ab6573088b4a
--- a/web/views/boxes.py	Tue Nov 24 13:59:46 2009 +0100
+++ b/web/views/boxes.py	Tue Nov 24 17:27:10 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