Merge pull request #1603 from normanjaeckel/FixStable

Fixed error when starting webbrowser. Added info on port to general start message.
This commit is contained in:
Norman Jäckel 2015-07-25 21:44:02 +02:00
commit 39aa8b39f1
3 changed files with 19 additions and 8 deletions

View File

@ -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)

View File

@ -281,7 +281,11 @@ def start_browser(browser_url):
Launches the default web browser at the given url and opens the
webinterface.
"""
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.

View File

@ -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}