ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #844 from emanuelschuetze/stable/1.4.x

Browse Source 
(portable win32) Start server without '--address' if host is default (0....
This commit is contained in:
Oskar Hahn 2013-07-29 13:37:24 -07:00
commit 58affb4ca8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extras/openslides_gui/gui.py
View File

@ -520,6 +520,9 @@ class MainWindow(wx.Frame):
if not last_backup is None: if not last_backup is None:
self.last_backup = datetime.datetime.strptime( self.last_backup = datetime.datetime.strptime(
last_backup, "%Y-%m-%d %H:%M:%S") last_backup, "%Y-%m-%d %H:%M:%S")
server_settings = settings.get("server_settings", {})
setattr_unless_none("host", server_settings.get("host"))
setattr_unless_none("port", server_settings.get("port"))
def save_gui_settings(self): def save_gui_settings(self):
if self.last_backup is None: if self.last_backup is None:
@ -534,6 +537,9 @@ class MainWindow(wx.Frame):
"interval_unit": self.backupdb_interval_unit, "interval_unit": self.backupdb_interval_unit,
"last_backup": last_backup "last_backup": last_backup
}, },
"server_settings": {
"host": self.host,
"port": self.port,
} }
dp = os.path.dirname(self.gui_settings_path) dp = os.path.dirname(self.gui_settings_path)
@ -613,6 +619,9 @@ class MainWindow(wx.Frame):
self.cmd_run_ctrl.cancel_command() self.cmd_run_ctrl.cancel_command()
return return
if self._host == "0.0.0.0":
args = ["--port", self._port]
else:
args = ["--address", self._host, "--port", self._port] args = ["--address", self._host, "--port", self._port]
if not self.cb_start_browser.GetValue(): if not self.cb_start_browser.GetValue():
args.append("--no-browser") args.append("--no-browser")