merge
This commit is contained in:
commit
5ac1858b95
2 files changed
+7
-5
No files matched your search
@@ -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',
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user