From f9727caa4ee0916f0330d4838bcd7141c5a370a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 26 Jun 2008 11:26:28 +0200 Subject: [PATCH] Prevent calling twice get_sc --- tryton/gui/main.py | 17 +++++++++-------- tryton/gui/window/view_tree/view_tree_sc.py | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tryton/gui/main.py b/tryton/gui/main.py index f425ce775a..0a1e71a7bc 100644 --- a/tryton/gui/main.py +++ b/tryton/gui/main.py @@ -605,19 +605,20 @@ class Main(object): def get_main(): return _MAIN[0] - def shortcut_set(self): + def shortcut_set(self, shortcuts=None): def _action_shortcut(widget, action): ctx = rpc.CONTEXT.copy() Action.exec_keyword('tree_open', {'model': 'ir.ui.menu', 'id': action, 'ids': [action], 'window': self.window}, context=ctx) - user = rpc._USER - try: - shortcuts = rpc.execute('object', 'execute', - 'ir.ui.view_sc', 'get_sc', user, 'ir.ui.menu', - rpc.CONTEXT) - except: - shortcuts = [] + if shortcuts is None: + user = rpc._USER + try: + shortcuts = rpc.execute('object', 'execute', + 'ir.ui.view_sc', 'get_sc', user, 'ir.ui.menu', + rpc.CONTEXT) + except: + shortcuts = [] menu = gtk.Menu() for shortcut in shortcuts: menuitem = gtk.MenuItem(shortcut['name']) diff --git a/tryton/gui/window/view_tree/view_tree_sc.py b/tryton/gui/window/view_tree/view_tree_sc.py index 252caf474c..727c02224c 100644 --- a/tryton/gui/window/view_tree/view_tree_sc.py +++ b/tryton/gui/window/view_tree/view_tree_sc.py @@ -43,7 +43,7 @@ class ViewTreeSC(object): 2, shortcut['id']) self.tree.set_model(store) if self.model == 'ir.ui.menu': - Main.get_main().shortcut_set() + Main.get_main().shortcut_set(shortcuts=view_sc) def value_get(self, col): sel = self.tree.get_selection().get_selected()