bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Andreas Stephanides
2020-09-13 08:25:03 +00:00
parent f223b19923
commit 353404b298
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fet2020/posts/models.py
View File

@@ -100,7 +100,6 @@ class Post(models.Model):
@property @property
def agenda_html(self): def agenda_html(self):
<<<<<<< HEAD
if not self.agenda_key: if not self.agenda_key:
return None return None
h=ep.getPadHTML(self.agenda_key) h=ep.getPadHTML(self.agenda_key)
@@ -113,13 +112,7 @@ class Post(models.Model):
request_logger.info("set etherpad!") request_logger.info("set etherpad!")
return value return value
=======
return "<h1>Agenda</h1>"
# @agenda_html.setter
# def agenda_html_set(self, value):
# return value
>>>>>>> 72b4b7d982139cd76d2d5389e7b906097d75a0c0
@property @property
def get_tagnames(self): def get_tagnames(self):
return ["#%s" % t for t in self.tags.names()] return ["#%s" % t for t in self.tags.names()]