Commit a85e279e authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

Merge branch 'master' of

parents c7097877 2ef6e50b
......@@ -226,14 +226,13 @@ class Protocol(DatabaseModel):
return "Protokoll:{}-{:%Y-%m-%d}".format(self.protocoltype.short_name,
def get_etherpad_link(self):
if self.pad_identifier is not None:
return self.pad_identifier
if self.pad_identifier is None:
identifier = self.get_identifier()
if self.protocoltype.non_reproducible_pad_links:
identifier = "{}-{}".format(identifier, str(uuid4()))
self.pad_identifier = identifier
return get_etherpad_url(identifier)
return get_etherpad_url(self.pad_identifier)
def get_datetime(self):
return datetime(,,, self.protocoltype.usual_time.hour, self.protocoltype.usual_time.minute)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment