merged

fet2020/posts/models.py

@@ -6,17 +6,12 @@ from django.utils import timezone
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from taggit.managers import TaggableManager
-import logging
-request_logger = logging.getLogger('django.request')
-# import documents
 from documents import ep
 
 from .managers import (
     PostManager, ArticleManager, NewsManager, AllEventManager, EventManager, FetMeetingManager
 )
 
-# from ckeditor_uploader import RichTextUploadingField
-# import uuid
 import re
 from rest_framework import serializers
 
@@ -24,6 +19,7 @@ from datetime import timedelta
 
 import logging
 logger = logging.getLogger('posts')
+request_logger = logging.getLogger('django.request')
 
 
 class Category(models.Model):
@@ -101,8 +97,10 @@ class Post(models.Model):
     def get_tags(self):
         """Returns assigned tags as a comma seperated list."""
         return ",".join(self.tags.names())
+
     @property
     def agenda_html(self):
+<<<<<<< HEAD
         if not self.agenda_key:
             return None
         h=ep.getPadHTML(self.agenda_key)
@@ -116,6 +114,13 @@ class Post(models.Model):
         request_logger.info("set etherpad!")
         return value
         
+=======
+        return "<h1>Agenda</h1>"
+
+    # @agenda_html.setter
+    # def agenda_html_set(self, value):
+    #    return value
+>>>>>>> 72b4b7d982139cd76d2d5389e7b906097d75a0c0
     @property
     def get_tagnames(self):
         return ["#%s" % t for t in self.tags.names()]
@@ -168,7 +173,7 @@ class Post(models.Model):
         if self.has_protocol:
             self.protocol_key = ep.createPadifNotExists(self.slug + "-protocol")
         request_logger.info(self.post_type)
-        
+
         super().save(*args, **kwargs)
 
         self.tags.set(
@@ -196,9 +201,9 @@ class PostSerializer(serializers.HyperlinkedModelSerializer):
             'image',
             'event_start',
             'event_end',
-            'is_hidden', 
+            'is_hidden',
             'agenda_html'
- #           'author'#,           
+            # 'author',
         ]