djgentelella 0.5.1__py3-none-any.whl → 0.5.3__py3-none-any.whl

djgentelella/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.5.1'
+__version__ = '0.5.3'
 
 if __name__ == '__main__':
     print(__version__)

djgentelella/gtselects.py

@@ -1,9 +1,10 @@
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
 
 from djgentelella.groute import register_lookups
 from djgentelella.permission_management import AllPermission
 from djgentelella.views.select2autocomplete import BaseSelect2View
-
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 @register_lookups(prefix="userbase", basename="userbase")
 class User(BaseSelect2View, AllPermission):

djgentelella/history/api.py

@@ -102,12 +102,9 @@ class HistoryViewSet(AuthAllPermBaseObjectManagement):
 
         # check contenttype param in form
         ctypes_param = self.request.GET.get("contenttype")
-        print(allowed)
         if ctypes_param and ctypes_param in allowed:
 
             ctypes_qs = self.contenttypes_from_settings([ctypes_param])
-            print(ctypes_qs)
-
 
             if not ctypes_qs.exists():
                 return queryset.none()

djgentelella/history/utils.py

@@ -45,8 +45,10 @@ def add_log(
 
     if change_message:
         if action_flag != DELETION and changed_data:
-            verbose_changes = [object._meta.get_field(f).verbose_name for f in
-                               changed_data]
+            verbose_changes = [
+                str(object._meta.get_field(f).verbose_name)
+                for f in changed_data
+            ]
 
             change_message = _("%(msg)s. Fields: %(fields)s") % {
                 "msg": change_message,

djgentelella/models.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from tree_queries.models import TreeNode
@@ -9,7 +9,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
 from .models_manager import ObjectManager, AllObjectsManager, \
     DeletedObjectsManager
-
+from  djgentelella.settings import USER_MODEL_BASE
 from djgentelella.history.utils import add_log, ADDITION
 
 class GentelellaSettings(models.Model):
@@ -63,7 +63,6 @@ class Help(models.Model):
     def __str__(self):
         return self.help_text
 
-
 class Notification(models.Model):
     STATE = [('visible', _('Visible')),
              ('hide', _('Hidden'))]
@@ -78,7 +77,7 @@ class Notification(models.Model):
 
     description = models.TextField(verbose_name=_("Description"))
     link = models.URLField(verbose_name=_('Link'))
-    user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_('User'))
+    user = models.ForeignKey(USER_MODEL_BASE, on_delete=models.CASCADE, verbose_name=_('User'))
     # warning, success, info,
     message_type = models.CharField(max_length=150, choices=MESSAGE_TYPE,
                                     verbose_name=_('Message Type'))
@@ -122,7 +121,7 @@ class ChunkedUpload(AbstractChunkedUpload):
     Default chunked upload model.
     """
     user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
+        USER_MODEL_BASE,
         on_delete=models.CASCADE,
         related_name='chunked_uploads',
         null=DEFAULT_MODEL_USER_FIELD_NULL,
@@ -144,7 +143,7 @@ class Trash(models.Model):
         help_text=_("Value of str(instance) at deletion time"),
     )
     deleted_by = models.ForeignKey(
-        User,
+        USER_MODEL_BASE,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,

djgentelella/notification/serializer.py

@@ -1,13 +1,13 @@
 from rest_framework import serializers
 from rest_framework.pagination import LimitOffsetPagination
 
-from django.contrib.auth.models import User
 from djgentelella.models import Notification
 from django.utils import formats
 from django_filters import FilterSet
 from django_filters import DateTimeFromToRangeFilter
 from djgentelella.fields.drfdatetime import DateTimeRangeTextWidget
-
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 class NotificationFilterSet(FilterSet):
     creation_date = DateTimeFromToRangeFilter(

djgentelella/settings.py

@@ -7,6 +7,7 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.templatetags.static import static
 from django.utils.module_loading import import_string
 from django.utils.translation import gettext_lazy as _
+from django.contrib.auth import get_user_model
 
 NOTIFICATION_DEFAULT_SUBJECT = getattr(settings, 'NOTIFICATION_DEFAULT_SUBJECT',
                                        _('You have a new notification'))
@@ -25,7 +26,7 @@ DEFAULT_GROUP_MODEL_BASE = 'GT_GROUP_MODEL'
 DEFAULT_USER_MODEL_BASE = 'GT_USER_MODEL'
 REGISTER_DEFAULT_USER_API = getattr(settings, 'REGISTER_DEFAULT_USER_API', True)
 DEFAULT_GROUP_MODEL = 'django.contrib.auth.models.Group'
-DEFAULT_USER_MODEL = 'django.contrib.auth.models.User'
+DEFAULT_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
 GROUP_MODEL_BASE = getattr(
     settings, DEFAULT_GROUP_MODEL_BASE, DEFAULT_GROUP_MODEL)
@@ -38,10 +39,12 @@ try:
 except Exception as e:
     from django.contrib.auth.models import Group
 try:
-    User = import_string(USER_MODEL_BASE)
+    # User = import_string(USER_MODEL_BASE)
+    User = get_user_model()
 except Exception as e:
     from django.contrib.auth.models import User
 
+
 ############################################
 #    Chunked Upload
 ############################################
@@ -86,4 +89,3 @@ MAX_BYTES = getattr(settings, 'CHUNKED_UPLOAD_MAX_BYTES', DEFAULT_MAX_BYTES)
 ############################################
 #   END UPLOAD CHUNKED
 
-

djgentelella/static/gentelella/js/base/select2related.js

@@ -133,6 +133,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                 if(parent.relatedobjs[x]['start_empty']){
                     newselect.val(null).trigger('change');
                 }
+
             }
             let contexts2empty = {
               placeholder: gettext('Select an element'),

djgentelella/static/gentelella/js/base.js

@@ -672,6 +672,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                 if(parent.relatedobjs[x]['start_empty']){
                     newselect.val(null).trigger('change');
                 }
+
             }
             let contexts2empty = {
               placeholder: gettext('Select an element'),

djgentelella/tests/Notification_Test.py

@@ -3,7 +3,6 @@ import re
 import uuid
 
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.test import Client
 from django.test import TestCase, RequestFactory
 from django.urls import reverse
@@ -17,7 +16,8 @@ from rest_framework.test import APIClient
 from demoapp.views import create_notification
 from djgentelella.models import Notification
 from djgentelella.notification.base import NotificationViewSet
-
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 class ApiNotificationsTestCase(TestCase):
     def setUp(self):

djgentelella/trash/serializer.py

@@ -14,7 +14,7 @@ class TrashSerializer(serializers.ModelSerializer):
     def get_actions(self, obj):
         user = self.context["request"].user
         return {
-            "restore": user.has_perm("djgentelella.update_trash"),
+            "restore": user.has_perm("djgentelella.delete_trash"),
             "destroy": user.has_perm("djgentelella.delete_trash"),
         }
 

{djgentelella-0.5.1.dist-info → djgentelella-0.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djgentelella
-Version: 0.5.1
+Version: 0.5.3
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Author-email: Solvosoft <info@solvosoft.com>
 Maintainer-email: Luis Zarate Montero <luis.zarate@solvosoft.com>

{djgentelella-0.5.1.dist-info → djgentelella-0.5.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
-djgentelella/__init__.py,sha256=xGoYd5NTOhjLYygw0IvhnTDGueA8bPZ3lRcyQnql000,73
+djgentelella/__init__.py,sha256=GwM_oQotrXojmqqVNM_VjXYsSOHj0EWe-zhcG0VShk4,73
 djgentelella/admin.py,sha256=1LhKD8iGGl-eHDVvZxH2JPdkSEhQEfT9trDYVaJkIe4,2999
 djgentelella/apps.py,sha256=5VEbpUv4b1Jh7gCRAQCe5TvpakRyndKwafjVj0z-Xfo,153
 djgentelella/chartjs.py,sha256=iNYoFnaIQoXsYInJFbSE2quWpjmDz5CuMKpVsvt4pRM,8572
 djgentelella/elements.py,sha256=tMGzA1pE_PytYgAMJutuaYGsnk4k8y7-Kg_D6F5rV6o,3340
 djgentelella/exceptions.py,sha256=x321e40KAjqS5cDv7lIc1TEoSYwTw-pHm7eZV_o0xBI,262
 djgentelella/groute.py,sha256=FPKKZBfm0UYAfMKmeLGhPBWqPXqazADjt7iKMruVmcE,799
-djgentelella/gtselects.py,sha256=f8tBg68KQoYYCW1YNZt8PiKmdjItJY2kwN23ScO6nqM,590
-djgentelella/models.py,sha256=RiojQMM1rvnOO4LsVvguPJclw1RO_hQJnKU7YSMrMzg,7479
+djgentelella/gtselects.py,sha256=4HiQGmV0OgdT4Eky0bsgudEEWBa3S0M8scP0RN-X4Mk,654
+djgentelella/models.py,sha256=TeDZhFca6Vdcfo0iU_AYMTFUShoScOPvMwX3c7XWwwA,7535
 djgentelella/models_manager.py,sha256=cpiL90mNBVO_BQTmrIUq5V1JQ6AedUwYKZSz1eZ0Eyg,1036
 djgentelella/objectmanagement.py,sha256=y_dkSKIOfKKK9t1hZ8mwcM5RNxj0bChpKYvUn50mVzs,3121
-djgentelella/settings.py,sha256=kOuXF0T9ZIg_NqIStkiKdM-QOLrRjjfHP-AVXvSGRAM,3205
+djgentelella/settings.py,sha256=7x7R6182YDd9SjGDNDceSwRcwYTVJgEIqU1hNtBmPZE,3298
 djgentelella/urls.py,sha256=Ht4AhWLYlY64hR-_D4N13vBmrD_7STi08V7z7c1Z-3Y,5427
 djgentelella/utils.py,sha256=Bh_-KBrrLRAK_b_CkyYm0Y0HdKyJAp2vNIwESYd3PcA,825
 djgentelella/blog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,10 +75,10 @@ djgentelella/forms/__init__.py,sha256=tsFtaTeLH5pOQrgAVd4xjU6w3rPskn15b9kiW9GZuH
 djgentelella/forms/decorators.py,sha256=MpXYM2P4lgLLoNhTVwphYHPENIipKk-qEP9MmEa-nrY,2328
 djgentelella/forms/forms.py,sha256=wFpNJT8GAhYDfjGZ_f_IrHRIAC9Ly1_VznDQCoDgUAg,7718
 djgentelella/forms/models.py,sha256=eZNVwPVytY0vVXUgmVWiZfZsXctFy62O1JsYyxqL4v0,389
-djgentelella/history/api.py,sha256=nWldGOC4jAqk9E7Ice4tlLCsxtPbEF7ToV9i8aLFLwg,4932
+djgentelella/history/api.py,sha256=1s1jfFu0yBITa780Wcs1NDMAux8Xxr8uFlFpBPROJHI,4879
 djgentelella/history/filterset.py,sha256=tIYSt7rWljm1Xm3bqAcG1B_j9ZTxsSirxhF3n6GjGw4,783
 djgentelella/history/serializers.py,sha256=ADTqlPaiG5hEJGbXMHlfMvaGpAs4p52LZPAMzzmHnGM,1574
-djgentelella/history/utils.py,sha256=-JAGSlyApxFgtit7z4dZKn4Cg09_giLI4Y_8uc-jkog,2016
+djgentelella/history/utils.py,sha256=O9n8MLOlS2atGYD_SywiDIQneeyhlGC3idSV7ouycJI,2036
 djgentelella/locale/es/LC_MESSAGES/django.mo,sha256=Bq0ru4iFONojSq_ChXcbFKJrv_fKyqhudbHtXTc0HHY,15925
 djgentelella/locale/es/LC_MESSAGES/django.po,sha256=CtzQ2aRitBeOQy123OV25d6dxaZi92jiiJBmBjlQWaI,15640
 djgentelella/locale/es/LC_MESSAGES/djangojs.mo,sha256=MKtZ5pZ7Pax03bn7bKzr5wfnNl1pgQHMKDLItlRe8qY,6258
@@ -114,7 +114,7 @@ djgentelella/migrations/0018_alter_chunkedupload_status.py,sha256=cEsy29d9bryNVS
 djgentelella/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/notification/__init__.py,sha256=Xz_RootxxW07E9GVvn6Rqz9x-P_M7ZU1-WwrxB8rD_8,3585
 djgentelella/notification/base.py,sha256=VRxfoQwAgMVsWRBNAdh42JboRUQllXDfhqhMA89uMAQ,2760
-djgentelella/notification/serializer.py,sha256=YnOdpZNXHDkdadOHYI3omdnXhDFlv-JNAtB2zTYVMQI,1963
+djgentelella/notification/serializer.py,sha256=ehLL7YO8vVehqk2xMQelHxuQsKWYVr1piYB7-oGeSnY,1989
 djgentelella/notification/widgets.py,sha256=EjmF6tXiHjme4ersZvUGbN79qoFwzSYGY_rgdvmAGiU,1752
 djgentelella/permission_management/__init__.py,sha256=8BVm2rBwOJg78xz7YW4HDTFJC2u32x3hbiojsjcmrRg,1574
 djgentelella/permission_management/forms.py,sha256=VgdDflP29d-tDAH3DAVpHabESns1akjMwoTNIq1wKw0,1562
@@ -153,7 +153,7 @@ djgentelella/static/gentelella/images/forward_disabled.png,sha256=7enxADzvJa3VzC
 djgentelella/static/gentelella/images/forward_enabled.png,sha256=vLOxO1qvkBV2ev931iHx-VV63NjrgoTQbwtR4kdVVrA,1380
 djgentelella/static/gentelella/images/forward_enabled_hover.png,sha256=T6LWiaYzcT2fuJAGEaZGxd8Lok3rlZerlVxiy6d647Q,1379
 djgentelella/static/gentelella/images/loading.gif,sha256=dyCz9kckQBZKy7DpKpR3hL4xgQgnShbMue3Ao9h_lK0,30269
-djgentelella/static/gentelella/js/base.js,sha256=xhc5euhpenfu38aZb_cjaQLktQfyyyhBBD0CrIvGYSg,135814
+djgentelella/static/gentelella/js/base.js,sha256=mEDPWwxu_ELsbDIv4Uoyrer76rhedhCvdoy2189LRH0,135815
 djgentelella/static/gentelella/js/custom.js,sha256=bZhfcrwiAWBrqnRfPPeawB8v9uqrHjoxVbwZfwb1Up4,15103
 djgentelella/static/gentelella/js/datatables.js,sha256=ZmEBPhoj8jDgl_1g14J9tKtiMknyzBekp1_NqAlxjuU,13743
 djgentelella/static/gentelella/js/digital_signature_update.js,sha256=PaUSb8nHwv-R2N7NVFA5cb4-rdnAZ4bEf12j9IxTYr4,1241
@@ -178,7 +178,7 @@ djgentelella/static/gentelella/js/base/mapbased_storymap.js,sha256=i4Ef8ATjzpyNP
 djgentelella/static/gentelella/js/base/mediarecord.js,sha256=RsfbxDp2PzyRD4rt12C1xfd60jKOWV_P0eLttoYKNv4,12489
 djgentelella/static/gentelella/js/base/notifications.js,sha256=lNVDcn2pwuhcTiEYw-H1BePScG8lDm9loxvYAU024Mw,4711
 djgentelella/static/gentelella/js/base/select2_wrap.js,sha256=D1YIJSpJe7nTDOBV1OZh_6_MhHePwY-LhqIb6fIcVWY,840
-djgentelella/static/gentelella/js/base/select2related.js,sha256=-Os8NPc5YlebihBtM_J9vkFToCtPDBKf067O6mE5WBg,6388
+djgentelella/static/gentelella/js/base/select2related.js,sha256=mLGWca6GQRusNhZ07UIRQJY7JuWlKta6W7ri1tT62YI,6389
 djgentelella/static/gentelella/js/base/storyline.js,sha256=oRT1j-b0PeecKxog_d7sjdwq-GxLpF08Yk_4DnQXBKY,867
 djgentelella/static/gentelella/js/base/tagify.js,sha256=MnSZTKKGndr0qynntykDBdp3JVp208mVz53147T87jY,1779
 djgentelella/static/gentelella/js/base/timeline.js,sha256=UDytpFrPPvTEteACPtR1U8TfJymS_FdNe110jmnKBO0,788
@@ -1012,7 +1012,7 @@ djgentelella/templatetags/timejs.py,sha256=fmiA8FEoBr-EYnO6tji6tKBmA39g3HtX7oaU7
 djgentelella/templatetags/tree_tags.py,sha256=IOMcdXaX3IBAawoGoteRYqF5Y2ggxsLweR5XZqxfpMk,59
 djgentelella/templatetags/urlname_tags.py,sha256=2IjabanvTSHreasTyhOEiuwFecHb_SnCdSIjdSxQJLw,1945
 djgentelella/tests/Calendar_Test.py,sha256=unFWritybgNmYjEGCct1cS2meZOFGHcA-od17XCoqrc,5216
-djgentelella/tests/Notification_Test.py,sha256=KzPvbCXGTwdF5jJ2AE86U9ZquhIArM65jjhdLMV4MFQ,18903
+djgentelella/tests/Notification_Test.py,sha256=EvWE4mmk9jkH1FkGlFpBadZegbydvDUI5RnGmrD3oo0,18929
 djgentelella/tests/StoryLine_Test.py,sha256=fU90zCc0HWIe7YTlHqRfYC-uIFp7qFpege5eVc2kQtY,8523
 djgentelella/tests/StoryMap_Test.py,sha256=wgiBpAMTFdPTQs2JqlJIBnmzbBFIlSX7_HmHIfIc-Rg,4031
 djgentelella/tests/TimeLine_Test.py,sha256=ddaX3b9KA9LYiu81tC2-oVJFmj3RU0pr2-r4mNCyRF8,3540
@@ -1021,7 +1021,7 @@ djgentelella/tests/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 djgentelella/tests/fields/files.py,sha256=s8efFF2xjmyAO34GRntnOkjHPwPu7dwM8Pm2WMRjKrc,1193
 djgentelella/trash/api.py,sha256=nXUoBkFDKCQgrbBHDLs8jU3rC4yH5Jjc44pA8UkL6NI,2810
 djgentelella/trash/filterset.py,sha256=CEMffL5NNNLcKZ445wNFX_RPtpSDDbGqFUZqc2uwQAk,617
-djgentelella/trash/serializer.py,sha256=Aq-3RrqqPNiSuyEuaKW4ir6zn_Ox2ig2gqcjH4jay_c,1428
+djgentelella/trash/serializer.py,sha256=A1GlhZyqO9g_3Z2Zi1AryXRI64gpCPrJ_yT-sfdA9Ck,1428
 djgentelella/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/views/auth.py,sha256=ipr8O1a4dsqgVSBASAKw9FYpk5E5gDBjkzknkFnDRaY,308
 djgentelella/views/listAreaViewset.py,sha256=rMjp7OKxTlIXF1vFBeO3_53Hli8UKzoutk5Ohccoy_o,3273
@@ -1047,9 +1047,9 @@ djgentelella/widgets/trees.py,sha256=bV6s-w1cgYahS0aNU6xBrx-aISdlzDZ23BFt3_3hAu4
 djgentelella/widgets/wysiwyg.py,sha256=wHeMyYNVE8-lKJ06A-0DLDAcRNv3TOAOG_Wl9DYZqS0,609
 djgentelella/wysiwyg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/wysiwyg/views.py,sha256=tI7LjLhCnohdvIEOEEhB2Cu1zxRmdcOhYJJX4LBIZaA,1159
-djgentelella-0.5.1.dist-info/AUTHORS,sha256=HyQoO-q7oXtavpNm7jaBVv8Vxx3c7yo33xkFkt4blkY,118
-djgentelella-0.5.1.dist-info/LICENSE.txt,sha256=wDzqAntLQORAL6vQhVdzZyfsPVvFStZKtkct5DIZjK0,18047
-djgentelella-0.5.1.dist-info/METADATA,sha256=H8aSJ_BjDI7dTuvEjk2jwJ9ZlmjGw7xGxurGuJ4H7wM,27544
-djgentelella-0.5.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-djgentelella-0.5.1.dist-info/top_level.txt,sha256=88JbODVPV-P5q7ic25yMHt_FuuizaLzMyIaegpFa7Qk,13
-djgentelella-0.5.1.dist-info/RECORD,,
+djgentelella-0.5.3.dist-info/AUTHORS,sha256=HyQoO-q7oXtavpNm7jaBVv8Vxx3c7yo33xkFkt4blkY,118
+djgentelella-0.5.3.dist-info/LICENSE.txt,sha256=wDzqAntLQORAL6vQhVdzZyfsPVvFStZKtkct5DIZjK0,18047
+djgentelella-0.5.3.dist-info/METADATA,sha256=GthqTt2vdxSei73s0L9AKFpkCuLhi1pHCZ0qSaGILJk,27544
+djgentelella-0.5.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+djgentelella-0.5.3.dist-info/top_level.txt,sha256=88JbODVPV-P5q7ic25yMHt_FuuizaLzMyIaegpFa7Qk,13
+djgentelella-0.5.3.dist-info/RECORD,,