Reverted "Refs #720 -- Added bio/website fields for DSF members."

This reverts commit c3128f1bc9f37c9d9d8717cb511d00bc5bb9312f as it's
unused since 4a3cd803acbc03133cee9b0ca824c5b3d039e9fd.

8 files changed, 23 insertions, 54 deletions

diff --git a/members/admin.py b/members/admin.py
index 1d6beb43..548706b0 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -4,13 +4,12 @@ from django.contrib import admin
 from django.templatetags.static import static
 from django.utils.formats import localize
 from django.utils.html import format_html
-from markdownx.admin import MarkdownxModelAdmin
 
 from members.models import CorporateMember, IndividualMember, Invoice, Team
 
 
 @admin.register(IndividualMember)
-class IndividualMemberAdmin(MarkdownxModelAdmin):
+class IndividualMemberAdmin(admin.ModelAdmin):
     list_display = [
         'name',
         'email',
diff --git a/members/migrations/0007_auto_20170216_0837.py b/members/migrations/0007_auto_20170216_0837.py
index c69cf1aa..39d4b7c2 100644
--- a/members/migrations/0007_auto_20170216_0837.py
+++ b/members/migrations/0007_auto_20170216_0837.py
@@ -2,7 +2,6 @@
 # Generated by Django 1.10.5 on 2017-02-16 08:37
 from __future__ import unicode_literals
 
-import markdownx.models
 from django.db import migrations, models
 
 
@@ -16,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='individualmember',
             name='bio',
-            field=markdownx.models.MarkdownxField(blank=True),
+            field=models.TextField(blank=True),
         ),
         migrations.AddField(
             model_name='individualmember',
diff --git a/members/migrations/0008_auto_20181001_1031.py b/members/migrations/0008_auto_20181001_1031.py
new file mode 100644
index 00000000..acfd5c3a
--- /dev/null
+++ b/members/migrations/0008_auto_20181001_1031.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.1.2 on 2018-10-01 10:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0007_auto_20170216_0837'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='individualmember',
+            name='bio',
+        ),
+        migrations.RemoveField(
+            model_name='individualmember',
+            name='website',
+        ),
+    ]
diff --git a/members/models.py b/members/models.py
index dfaae9b5..aa834c87 100644
--- a/members/models.py
+++ b/members/models.py
@@ -4,10 +4,8 @@ from django.core import signing
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.utils.html import format_html
 from django.views.generic.dates import timezone_today
 from django_hosts import reverse
-from markdownx.models import MarkdownxField
 from sorl.thumbnail import ImageField, get_thumbnail
 
 BRONZE_MEMBERSHIP = 1
@@ -41,8 +39,6 @@ class IndividualMember(models.Model):
     member_since = models.DateField(default=timezone_today)
     member_until = models.DateField(null=True, blank=True)
     reason_for_leaving = models.TextField(blank=True)
-    bio = MarkdownxField(blank=True)
-    website = models.URLField(blank=True)
 
     class Meta:
         ordering = ['name']
@@ -54,12 +50,6 @@ class IndividualMember(models.Model):
     def is_active(self):
         return self.member_until is None
 
-    @property
-    def linked_name(self):
-        if self.website:
-            return format_html('<a href="{}">{}</a>', self.website, self.name)
-        return self.name
-
 
 class Team(models.Model):
     name = models.CharField(max_length=250)
diff --git a/members/templatetags/__init__.py b/members/templatetags/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/members/templatetags/__init__.py
+++ /dev/null
diff --git a/members/templatetags/markdown.py b/members/templatetags/markdown.py
deleted file mode 100644
index a4310e47..00000000
--- a/members/templatetags/markdown.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import bleach
-import markdown
-from django import template
-from django.utils.safestring import mark_safe
-
-register = template.Library()
-
-
-@register.filter(is_safe=True)
-def markdownify(text):
-    return mark_safe(
-        bleach.clean(
-            markdown.markdown(text, output_format='html5'),
-            tags=(
-                'a', 'abbr', 'acronym', 'b', 'blockquote', 'em', 'i', 'li',
-                'ol', 'p', 'sup', 'strong', 'ul',
-            ),
-        )
-    )
diff --git a/members/test_models.py b/members/test_models.py
index 04f97a87..ce74a837 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -1,7 +1,6 @@
 from datetime import date, timedelta
 
 from django.test import TestCase
-from django.utils.safestring import SafeData
 
 from members.models import (
     GOLD_MEMBERSHIP, PLATINUM_MEMBERSHIP, SILVER_MEMBERSHIP, CorporateMember,
@@ -24,12 +23,6 @@ class IndividualMemberTests(TestCase):
     def test_str(self):
         self.assertEqual(str(self.member), 'DjangoDeveloper')
 
-    def test_linked_name(self):
-        self.assertEqual(self.member.linked_name, 'DjangoDeveloper')
-        self.member.website = 'djangoproject.com'
-        self.assertEqual(self.member.linked_name, '<a href="djangoproject.com">DjangoDeveloper</a>')
-        self.assertIsInstance(self.member.linked_name, SafeData)
-
     def test_member_since_should_have_default(self):
         self.assertEqual(IndividualMember().member_since, date.today())
 
diff --git a/members/test_templatetags.py b/members/test_templatetags.py
deleted file mode 100644
index 0e1d2b90..00000000
--- a/members/test_templatetags.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.test import SimpleTestCase
-from django.utils.safestring import SafeData
-
-from .templatetags.markdown import markdownify
-
-
-class MarkdownifyTests(SimpleTestCase):
-    def test_str(self):
-        result = markdownify('Line\n\n[Link](https://www.djangoproject.com)')
-        self.assertEqual(
-            result,
-            '<p>Line</p>\n<p><a href="https://www.djangoproject.com">Link</a></p>',
-        )
-        self.assertIsInstance(result, SafeData)