Do not fail on One2Many with only tree mode

switch_view should stop when it does not find the view type.
WinForm should not open if the requested view type can not be set.

issue7824
review45791002
This commit is contained in:
Cédric Krier committed 2018-10-31 18:21:31 +01:00
1 parent d8f2a2a1e1
commit d85484ba5f
3 files changed
+11 -2

No files matched your search

+2
View File
@@ -27,6 +27,8 @@ class NoModal(object):
self.sensible_widget.props.sensitive = False
def destroy(self):
if not self.page:
return
self.page.dialogs.remove(self)
# Test if the parent is not already destroyed
if self.parent not in gtk.window_list_toplevels():
@@ -527,6 +527,8 @@ class Screen(SignalEvent):
% len(self.views))
if not view_type and view_id is None:
break
if view_type and not view_id and not len(self.view_to_load):
break
self.screen_container.set(self.current_view.widget)
self.display()
# Postpone set of the cursor to ensure widgets are allocated
+7 -2
View File
@@ -33,6 +33,9 @@ class WinForm(NoModal, InfoBar):
self.prev_view = self.screen.current_view
self.screen.screen_container.alternate_view = True
self.screen.switch_view(view_type=view_type)
if self.screen.current_view.view_type != view_type:
self.destroy()
return
if new:
self.screen.new(rec_name=rec_name)
self.win = gtk.Dialog(_('Link'), self.parent,
@@ -425,10 +428,12 @@ class WinForm(NoModal, InfoBar):
def destroy(self):
self.screen.screen_container.alternate_view = False
viewport = self.screen.screen_container.alternate_viewport
viewport.get_parent().remove(viewport)
if viewport and viewport.get_parent():
viewport.get_parent().remove(viewport)
self.screen.switch_view(view_type=self.prev_view.view_type)
self.screen.signal_unconnect(self)
self.win.destroy()
if getattr(self, 'win', None):
self.win.destroy()
NoModal.destroy(self)
def show(self):