From 2ef6e50bf50fd53e50a5c386b8d434fdbf72d234 Mon Sep 17 00:00:00 2001
From: FSMPI Admin-Team <admin@fsmpi.rwth-aachen.de>
Date: Wed, 15 Mar 2017 17:45:35 +0100
Subject: [PATCH] Fix generating etherpad links
/close #63
---
models/database.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/models/database.py b/models/database.py
index c56d9bd..07e5cee 100644
--- a/models/database.py
+++ b/models/database.py
@@ -226,15 +226,13 @@ class Protocol(DatabaseModel):
return "Protokoll:{}-{:%Y-%m-%d}".format(self.protocoltype.short_name, self.date)
def get_etherpad_link(self):
- print(self.pad_identifier)
- if self.pad_identifier is not None:
- return self.pad_identifier
- identifier = self.get_identifier()
- if self.protocoltype.non_reproducible_pad_links:
- identifier = "{}-{}".format(identifier, str(uuid4()))
- self.pad_identifier = identifier
- db.session.commit()
- return get_etherpad_url(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
+ db.session.commit()
+ return get_etherpad_url(self.pad_identifier)
def get_datetime(self):
return datetime(self.date.year, self.date.month, self.date.day, self.protocoltype.usual_time.hour, self.protocoltype.usual_time.minute)
--
GitLab