Don't set domain on request window open and remove request waiting for
issue334
This commit is contained in:
1 parent
23b5a59789
commit
87d5cc6543
2 files changed
+3
-41
No files matched your search
@@ -244,19 +244,6 @@
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkSeparatorMenuItem" id="séparateur12">
|
||||
<property name="visible">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkMenuItem" id="request_wait">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">_Waiting Requests</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="activate" handler="on_request_wait_activate"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
+3
-28
@@ -84,7 +84,6 @@ class Main(object):
|
||||
'on_preference_activate': self.sig_user_preferences,
|
||||
'on_read_requests_activate': self.sig_request_open,
|
||||
'on_send_request_activate': self.sig_request_new,
|
||||
'on_request_wait_activate': self.sig_request_wait,
|
||||
'on_opt_save_activate': lambda x: CONFIG.save(),
|
||||
'on_menubar_default_activate': lambda x: self.sig_menubar('default'),
|
||||
'on_menubar_icons_activate': lambda x: self.sig_menubar('icons'),
|
||||
@@ -306,10 +305,9 @@ class Main(object):
|
||||
ctx = {}
|
||||
ctx.update(rpc.CONTEXT)
|
||||
ctx['active_test'] = False
|
||||
return Window.create(None, 'res.request', False,
|
||||
[('act_from', '=', rpc._USER)], 'form',
|
||||
mode=['form', 'tree'], window=self.window,
|
||||
context=ctx)
|
||||
return Window.create(None, 'res.request', False, [
|
||||
], 'form', mode=['form', 'tree'], window=self.window,
|
||||
context=ctx)
|
||||
|
||||
def sig_request_open(self, widget):
|
||||
ctx = {}
|
||||
@@ -324,29 +322,6 @@ class Main(object):
|
||||
raise
|
||||
ids = ids1 + ids2
|
||||
return Window.create(False, 'res.request', ids, [
|
||||
('act_to', '=', rpc._USER),
|
||||
('active', '=', True),
|
||||
('id', 'in', ids),
|
||||
], 'form', mode=['tree', 'form'], window=self.window,
|
||||
context=ctx)
|
||||
|
||||
def sig_request_wait(self, widget):
|
||||
ctx = {}
|
||||
ctx.update(rpc.CONTEXT)
|
||||
ctx['active_test'] = False
|
||||
try:
|
||||
ids1, ids2 = self.request_set(True)
|
||||
except Exception, exception:
|
||||
if common.process_exception(exception, self.window):
|
||||
ids1, ids2 = self.request_set(True)
|
||||
else:
|
||||
raise
|
||||
ids = ids1 + ids2
|
||||
return Window.create(False, 'res.request', ids, [
|
||||
('act_from', '=', rpc._USER),
|
||||
('state', '=', 'waiting'),
|
||||
('active', '=', True),
|
||||
('id', 'in', ids),
|
||||
], 'form', mode=['tree', 'form'], window=self.window,
|
||||
context=ctx)
|
||||
|
||||
|
||||
Reference in new issue
Block a user