Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate user data type from int to charfield #517

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add custom user field
wisnuprama committed Apr 22, 2019
commit 6b7c4c867847322c03c2676054773c4cbc86a38a
4 changes: 3 additions & 1 deletion jet/dashboard/models.py
Original file line number Diff line number Diff line change
@@ -3,15 +3,17 @@
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
from jet.fields import UserField


@python_2_unicode_compatible
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 = UserField(verbose_name=_('user'))
column = models.PositiveIntegerField(verbose_name=_('column'))
order = models.IntegerField(verbose_name=_('order'))
settings = models.TextField(verbose_name=_('settings'), default='', blank=True)
15 changes: 15 additions & 0 deletions jet/fields.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from importlib import import_module

from django.db.models import Field

from jet import settings


def get_user_field():
pkg, mod = settings.JET_USER_FIELD.rsplit('.', 1)
cls = getattr(import_module(pkg), mod)
assert issubclass(cls, Field), 'JET_USER_FIELD is not instance of Field class'
return cls


UserField = get_user_field()
6 changes: 4 additions & 2 deletions jet/models.py
Original file line number Diff line number Diff line change
@@ -3,12 +3,14 @@
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _

from jet.fields import UserField


@python_2_unicode_compatible
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 = UserField(verbose_name=_('user'))
date_add = models.DateTimeField(verbose_name=_('date created'), default=timezone.now)

class Meta:
@@ -23,7 +25,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 = UserField(verbose_name=_('user'))
date_add = models.DateTimeField(verbose_name=_('date created'), default=timezone.now)

class Meta:
3 changes: 3 additions & 0 deletions jet/settings.py
Original file line number Diff line number Diff line change
@@ -11,3 +11,6 @@

# Improved usability
JET_CHANGE_FORM_SIBLING_LINKS = getattr(settings, 'JET_CHANGE_FORM_SIBLING_LINKS', True)

# Improved customability
JET_USER_FIELD = getattr(settings, 'JET_USER_FIELD', 'django.db.models.PositiveIntegerField')
13 changes: 13 additions & 0 deletions jet/tests/test_fields.py
Original file line number Diff line number Diff line change
@@ -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)