Commit 297c1610 by John Eskew

Change from deprecated IPAddressField model field to the new

GenericIPAddressField model field.
Bump the version number to 0.0.8.
Add migration file for the field conversion.
parent a9b8b0ef
...@@ -29,7 +29,7 @@ package_data = dict( ...@@ -29,7 +29,7 @@ package_data = dict(
setup( setup(
name = "django-wiki", name = "django-wiki",
version = "0.0.6", version = "0.0.8",
author = "Benjamin Bach", author = "Benjamin Bach",
author_email = "benjamin@overtag.dk", author_email = "benjamin@overtag.dk",
description = ("A wiki system written for the Django framework."), description = ("A wiki system written for the Django framework."),
......
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('wiki', '0002_remove_article_subscription'),
]
operations = [
migrations.AlterField(
model_name='articlerevision',
name='ip_address',
field=models.GenericIPAddressField(verbose_name='IP address', null=True, editable=False, blank=True),
),
migrations.AlterField(
model_name='attachmentrevision',
name='ip_address',
field=models.GenericIPAddressField(verbose_name='IP address', null=True, editable=False, blank=True),
),
migrations.AlterField(
model_name='revisionpluginrevision',
name='ip_address',
field=models.GenericIPAddressField(verbose_name='IP address', null=True, editable=False, blank=True),
),
]
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes import fields from django.contrib.contenttypes import fields
from django.contrib.auth.models import User, Group from django.contrib.auth.models import User, Group
from django.db.models.fields import GenericIPAddressField
from django.db import models from django.db import models
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
...@@ -12,6 +13,7 @@ from wiki.core.plugins import registry as plugin_registry ...@@ -12,6 +13,7 @@ from wiki.core.plugins import registry as plugin_registry
from wiki import managers from wiki import managers
from mptt.models import MPTTModel from mptt.models import MPTTModel
class Article(models.Model): class Article(models.Model):
objects = managers.ArticleManager() objects = managers.ArticleManager()
...@@ -217,7 +219,12 @@ class BaseRevisionMixin(models.Model): ...@@ -217,7 +219,12 @@ class BaseRevisionMixin(models.Model):
user_message = models.TextField(blank=True,) user_message = models.TextField(blank=True,)
automatic_log = models.TextField(blank=True, editable=False,) automatic_log = models.TextField(blank=True, editable=False,)
ip_address = models.IPAddressField(_('IP address'), blank=True, null=True, editable=False) ip_address = models.GenericIPAddressField(
_('IP address'),
blank=True,
null=True,
editable=False
)
user = models.ForeignKey(User, verbose_name=_('user'), user = models.ForeignKey(User, verbose_name=_('user'),
blank=True, null=True) blank=True, null=True)
......
Markdown is supported
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