fix options error and base_url

This commit is contained in:
Christian Barra
2017-01-27 14:19:43 +01:00
parent e151248ac2
commit 9373325f1b

View File

@@ -210,14 +210,15 @@ class User(HasTraits):
where name is the server uuid urlsafed where name is the server uuid urlsafed
""" """
db = self.db db = self.db
if 'server_name' in options:
if options is not None and 'server_name' in options:
server_name = options['server_name'] server_name = options['server_name']
else: else:
server_name = default_server_name(self) server_name = default_server_name(self)
server = orm.Server( server = orm.Server(
name = server_name, name = server_name,
cookie_name=self.cookie_name, cookie_name=self.cookie_name,
base_url=url_path_join(self.base_url, 'server', server_name), base_url=url_path_join(self.base_url, server_name),
) )
self.servers.append(server) self.servers.append(server)
db.add(self) db.add(self)