Merge lp:~georgeyk/stoq/cookie into lp:~stoq-dev/stoq/master-old

Proposed by George Kussumoto
Status: Merged
Merged at revision: not available
Proposed branch: lp:~georgeyk/stoq/cookie
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: None lines
To merge this branch: bzr merge lp:~georgeyk/stoq/cookie
Reviewer Review Type Date Requested Status
Ronaldo Maia Pending
Review via email: mp+10065@code.launchpad.net
To post a comment you must log in.
Revision history for this message
George Kussumoto (georgeyk) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stoq/gui/application.py'
--- stoq/gui/application.py 2009-07-02 15:34:41 +0000
+++ stoq/gui/application.py 2009-08-12 20:58:14 +0000
@@ -35,6 +35,7 @@
35from stoqlib.database.runtime import (get_current_user, new_transaction,35from stoqlib.database.runtime import (get_current_user, new_transaction,
36 finish_transaction, get_connection)36 finish_transaction, get_connection)
37from stoqlib.lib.interfaces import ICookieFile37from stoqlib.lib.interfaces import ICookieFile
38from stoqlib.lib.parameters import sysparam
38from stoqlib.gui.base.application import BaseApp, BaseAppWindow39from stoqlib.gui.base.application import BaseApp, BaseAppWindow
39from stoqlib.gui.base.search import StoqlibSearchSlaveDelegate40from stoqlib.gui.base.search import StoqlibSearchSlaveDelegate
40from stoqlib.gui.dialogs.csvexporterdialog import CSVExporterDialog41from stoqlib.gui.dialogs.csvexporterdialog import CSVExporterDialog
@@ -203,6 +204,13 @@
203 self.menu_hbox.pack_start(menubar, expand=False)204 self.menu_hbox.pack_start(menubar, expand=False)
204 menubar.show_all()205 menubar.show_all()
205206
207 if sysparam(self.conn).DISABLE_COOKIES:
208 self._clear_cookie()
209 store_cookie = self._ui.get_widget('/Menubar/UserMenu/StoreCookie')
210 store_cookie.hide()
211 clear_cookie = self._ui.get_widget('/Menubar/UserMenu/ClearCookie')
212 clear_cookie.hide()
213
206 def _create_debug_menu(self):214 def _create_debug_menu(self):
207 ui_string = """<ui>215 ui_string = """<ui>
208 <menubar name="menubar">216 <menubar name="menubar">

Subscribers

People subscribed via source and target branches