# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1259080030 -3600
# Node ID 6e7af0e8e524dd21c65a79fcf1ba924faeacb647
# Parent  2d23304289a6086f704f33dc4f0f7647bd0099be
more conditions have to be verified before unfolding the 'more actions' menu content directly into the box

diff -r 2d23304289a6 -r 6e7af0e8e524 web/views/boxes.py
--- 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