From feb979b9225946b768e77266f5b3ce80492a5ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 11 Jul 2008 15:40:38 +0200 Subject: [PATCH] Backed out changeset 04c9af13b24f show_search is used for xxx2Many views --- tryton/gui/window/form.py | 4 ++-- tryton/gui/window/view_form/screen/screen.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tryton/gui/window/form.py b/tryton/gui/window/form.py index 1bdbd4b3f4..81128a31f6 100644 --- a/tryton/gui/window/form.py +++ b/tryton/gui/window/form.py @@ -52,8 +52,8 @@ class Form(SignalEvent): self.screen = Screen(self.model, self.window, view_type=view_type, context=self.context, view_ids=view_ids, domain=domain, - hastoolbar=CONFIG['form.toolbar'], limit=limit, - readonly=bool(auto_refresh), form=self, + hastoolbar=CONFIG['form.toolbar'], show_search=True, + limit=limit, readonly=bool(auto_refresh), form=self, search_value=search_value) self.screen.signal_connect(self, 'record-message', self._record_message) self.screen.signal_connect(self, 'attachment-count', diff --git a/tryton/gui/window/view_form/screen/screen.py b/tryton/gui/window/view_form/screen/screen.py index 5f084a6a6e..83954c4cef 100644 --- a/tryton/gui/window/view_form/screen/screen.py +++ b/tryton/gui/window/view_form/screen/screen.py @@ -18,8 +18,9 @@ class Screen(SignalEvent): def __init__(self, model_name, window, view_ids=None, view_type=None, parent=None, context=None, views_preload=None, tree_saves=True, domain=None, create_new=False, row_activate=None, hastoolbar=False, - default_get=None, limit=None, readonly=False, form=None, - exclude_field=None, sort=None, search_value=None): + default_get=None, show_search=False, limit=None, + readonly=False, form=None, exclude_field=None, sort=None, + search_value=None): if view_ids is None: view_ids = [] if view_type is None: @@ -36,6 +37,7 @@ class Screen(SignalEvent): super(Screen, self).__init__() self.__current_model = None + self.show_search = show_search self.search_count = 0 self.hastoolbar = hastoolbar self.default_get = default_get @@ -86,7 +88,7 @@ class Screen(SignalEvent): self.display() def search_active(self, active=True): - if active: + if active and self.show_search: if not self.filter_widget: if not self.fields_view_tree: try: