diff --git a/jet/__init__.py b/jet/__init__.py index 0e917f69..9cff1bc2 100644 --- a/jet/__init__.py +++ b/jet/__init__.py @@ -1 +1 @@ -VERSION = '1.0.7' +VERSION = '1.1.0' diff --git a/jet/dashboard/migrations/0002_user_charfield.py b/jet/dashboard/migrations/0002_user_charfield.py new file mode 100644 index 00000000..4f3bfa00 --- /dev/null +++ b/jet/dashboard/migrations/0002_user_charfield.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2 on 2019-04-23 19:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dashboard', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='userdashboardmodule', + name='user', + field=models.CharField(max_length=255, verbose_name='user'), + ), + ] diff --git a/jet/dashboard/models.py b/jet/dashboard/models.py index cf43c30c..85c16508 100644 --- a/jet/dashboard/models.py +++ b/jet/dashboard/models.py @@ -3,6 +3,7 @@ from django.db import models from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ + from jet.utils import LazyDateTimeEncoder @@ -11,7 +12,7 @@ class UserDashboardModule(models.Model): title = models.CharField(verbose_name=_('Title'), max_length=255) module = models.CharField(verbose_name=_('module'), max_length=255) app_label = models.CharField(verbose_name=_('application name'), max_length=255, null=True, blank=True) - user = models.PositiveIntegerField(verbose_name=_('user')) + user = models.CharField(verbose_name=_('user'), max_length=255) column = models.PositiveIntegerField(verbose_name=_('column')) order = models.IntegerField(verbose_name=_('order')) settings = models.TextField(verbose_name=_('settings'), default='', blank=True) diff --git a/jet/migrations/0003_user_charfield.py b/jet/migrations/0003_user_charfield.py new file mode 100644 index 00000000..81192686 --- /dev/null +++ b/jet/migrations/0003_user_charfield.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2 on 2019-04-23 19:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('jet', '0002_delete_userdashboardmodule'), + ] + + operations = [ + migrations.AlterField( + model_name='bookmark', + name='user', + field=models.CharField(max_length=255, verbose_name='user'), + ), + migrations.AlterField( + model_name='pinnedapplication', + name='user', + field=models.CharField(max_length=255, verbose_name='user'), + ), + ] diff --git a/jet/models.py b/jet/models.py index 8fe97564..5cb36271 100644 --- a/jet/models.py +++ b/jet/models.py @@ -8,7 +8,7 @@ class Bookmark(models.Model): url = models.URLField(verbose_name=_('URL')) title = models.CharField(verbose_name=_('title'), max_length=255) - user = models.PositiveIntegerField(verbose_name=_('user')) + user = models.CharField(verbose_name=_('user'), max_length=255) date_add = models.DateTimeField(verbose_name=_('date created'), default=timezone.now) class Meta: @@ -23,7 +23,7 @@ def __str__(self): @python_2_unicode_compatible class PinnedApplication(models.Model): app_label = models.CharField(verbose_name=_('application name'), max_length=255) - user = models.PositiveIntegerField(verbose_name=_('user')) + user = models.CharField(verbose_name=_('user'), max_length=255) date_add = models.DateTimeField(verbose_name=_('date created'), default=timezone.now) class Meta: diff --git a/jet/tests/test_fields.py b/jet/tests/test_fields.py new file mode 100644 index 00000000..247d74ee --- /dev/null +++ b/jet/tests/test_fields.py @@ -0,0 +1,13 @@ +from django.db.models import PositiveIntegerField +from django.test import TestCase + +from jet.fields import get_user_field + + +class UserFieldTest(TestCase): + + def test_default_user_field(self): + default_cls = PositiveIntegerField + cls = get_user_field() + self.assertIsNotNone(cls) + self.assertEqual(cls, default_cls)