diff --git a/CHANGELOG b/CHANGELOG index bd58b98e6..bd783c22d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,13 @@ Version 1.7.1 (unreleased) Motions: - Show amendment button for users with permission 'can_create_motion' only. +- Fixed check_permission in motion support view. +- Fixed apply url for motion poll update view. +Assignments: +- Fixed tooltip to set a candidate as not elected. +Other: +- Fixed error when starting webbrowser. +- Added info on port to general start script message. Version 1.7 (2015-02-16) diff --git a/openslides/utils/main.py b/openslides/utils/main.py index c3a189841..6fbcc6f92 100644 --- a/openslides/utils/main.py +++ b/openslides/utils/main.py @@ -281,15 +281,19 @@ def start_browser(browser_url): Launches the default web browser at the given url and opens the webinterface. """ - browser = webbrowser.get() + try: + browser = webbrowser.get() + except webbrowser.Error as e: + print('Web browser controller error: %s' % e) + else: - def function(): - # TODO: Use a nonblocking sleep event here. Tornado has such features. - time.sleep(1) - browser.open(browser_url) + def function(): + # TODO: Use a nonblocking sleep event here. Tornado has such features. + time.sleep(1) + browser.open(browser_url) - thread = threading.Thread(target=function) - thread.start() + thread = threading.Thread(target=function) + thread.start() def get_database_path_from_settings(): diff --git a/openslides/utils/tornado_webserver.py b/openslides/utils/tornado_webserver.py index 2b4ff9092..dfe99edcf 100644 --- a/openslides/utils/tornado_webserver.py +++ b/openslides/utils/tornado_webserver.py @@ -74,7 +74,7 @@ def run_tornado(addr, port): # Print listening address and port to command line if addr == '0.0.0.0': - url_string = _("the machine's local ip address") + url_string = _("the machine's local ip address (port %s)") % port else: url_string = 'http://%s:%s' % (addr, port) print _("Starting OpenSlides' tornado webserver listening to %(url_string)s") % {'url_string': url_string}