Skip to content
New issue

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

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

Already on GitHub? # to your account

[UPDATED] -- Upgraded django-db-mailer for Django 4.2+ compatibility by replacing deprecated imports and fields. #131

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 6 additions & 6 deletions dbmail/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import os

from django.contrib.contenttypes.models import ContentType
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.shortcuts import redirect, render

try:
from django.core.urlresolvers import reverse
except ImportError:
from django.urls import reverse

from django.conf.urls import url
from django.urls import re_path
from django.contrib import messages
from django.contrib import admin

Expand Down Expand Up @@ -155,21 +155,21 @@ def browse_model_fields_view(self, request, pk, app, model):
def get_urls(self):
urls = super(MailTemplateAdmin, self).get_urls()
admin_urls = [
url(
re_path(
r'^(\d+)/sendmail/$',
self.admin_site.admin_view(self.send_mail_view),
name='send_mail_view'
),
url(
re_path(
r'^(\d+)/sendmail/apps/(.*?)/(.*?)/',
self.admin_site.admin_view(self.browse_model_fields_view),
name='browse_model_fields_view'),
url(
re_path(
r'^(\d+)/sendmail/apps/',
self.admin_site.admin_view(self.get_apps_view),
name='send_mail_apps_view'
),
url(
re_path(
r'^reset/cache/',
self.admin_site.admin_view(self.clean_cache_view),
name='clean_cache_view'
Expand Down
2 changes: 1 addition & 1 deletion dbmail/apps.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.apps import AppConfig


Expand Down
3 changes: 1 addition & 2 deletions dbmail/defaults.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# -*- encoding: utf-8 -*-

import os

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.conf import settings


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Generated by Django 4.2 on 2024-12-04 11:49

import ckeditor.fields
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("dbmail", "0015_auto_20180926_1206"),
]

operations = [
migrations.RenameIndex(
model_name="signaldeferreddispatch",
new_name="dbmail_sign_eta_bd53d1_idx",
old_fields=("eta", "done"),
),
migrations.AlterField(
model_name="mailbasetemplate",
name="message",
field=ckeditor.fields.RichTextField(
help_text="Basic template for mail messages. {{content}} tag for msg.",
verbose_name="Body",
),
),
migrations.AlterField(
model_name="mailtemplate",
name="message",
field=ckeditor.fields.RichTextField(verbose_name="Body"),
),
migrations.AlterField(
model_name="signaldeferreddispatch",
name="done",
field=models.BooleanField(null=True),
),
]
10 changes: 6 additions & 4 deletions dbmail/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import re

from django.core import signing
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.utils.html import strip_tags
from django.utils.timezone import now
from django.core.cache import cache
Expand Down Expand Up @@ -594,7 +594,7 @@ class SignalDeferredDispatch(models.Model):
kwargs = models.TextField()
params = models.TextField()
eta = models.DateTimeField(db_index=True)
done = models.NullBooleanField(default=None)
done = models.BooleanField(null=True)
created = models.DateTimeField(auto_now_add=True)

def run_task(self):
Expand All @@ -617,7 +617,7 @@ def add_task(cls, args, kwargs, params, interval):
)

class Meta:
index_together = (('eta', 'done'),)
indexes = [models.Index(fields=("eta", "done"))]


@python_2_unicode_compatible
Expand Down Expand Up @@ -711,7 +711,9 @@ def detect_ua(self):
import httpagentparser

data = httpagentparser.detect(self.ua)
get = lambda b, k: data.get(b, {}).get(k, '')

def get(b, k):
return data.get(b, {}).get(k, '')

self.ua_os = get('os', 'name')
self.ua_os_version = get('os', 'version')
Expand Down
16 changes: 8 additions & 8 deletions dbmail/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-

from django.conf.urls import url
from django.urls import re_path

from dbmail.views import (
send_by_dbmail, mail_read_tracker,
Expand All @@ -9,19 +9,19 @@
)

urlpatterns = [
url(r'^api/', send_by_dbmail, name='db-mail-api'),
url(r'^mail_read_tracker/(.*?)/$',
re_path(r'^api/', send_by_dbmail, name='db-mail-api'),
re_path(r'^mail_read_tracker/(.*?)/$',
mail_read_tracker, name='db-mail-tracker'),

url(r'^safari/v(?P<version>[0-9]{1})/pushPackages/(?P<site_pid>[.\w-]+)/?',
re_path(r'^safari/v(?P<version>[0-9]{1})/pushPackages/(?P<site_pid>[.\w-]+)/?',
SafariPushPackagesView.as_view()),
url(r'^safari/v(?P<version>[0-9]{1})/devices/'
re_path(r'^safari/v(?P<version>[0-9]{1})/devices/'
r'(?P<device_token>[.\w-]+)/registrations/(?P<site_pid>[.\w-]+)/?',
SafariSubscriptionView.as_view()),
url(r'^safari/v(?P<version>[0-9]{1})/log/?', SafariLogView.as_view()),
re_path(r'^safari/v(?P<version>[0-9]{1})/log/?', SafariLogView.as_view()),

url(r'^(?P<reg_type>web-push|mobile)/subscribe/',
re_path(r'^(?P<reg_type>web-push|mobile)/subscribe/',
PushSubscriptionView.as_view(), name='push-subscribe'),
url(r'^(?P<reg_type>web-push|mobile)/unsubscribe/',
re_path(r'^(?P<reg_type>web-push|mobile)/unsubscribe/',
PushSubscriptionView.as_view(), name='push-unsubscribe'),
]
20 changes: 9 additions & 11 deletions demo/demo/urls.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
import os
import sys
from django.conf.urls import include, url
from django.urls import include, re_path
from django.contrib import admin
from django.conf import settings

import demo.views


urlpatterns = [
url(r'^admin/', admin.site.urls),
# url(r'^rosetta/', include('rosetta.urls')),
url(r'^dbmail/', include('dbmail.urls')),
re_path(r"^admin/", admin.site.urls),
# re_path(r'^rosetta/', include('rosetta.urls')),
re_path(r"^dbmail/", include("dbmail.urls")),
]

if 'test' not in sys.argv:
if "test" not in sys.argv:
urlpatterns += [
url(r'^grappelli/', include('grappelli.urls')),
url('^browser_notification/$', demo.views.browser_notification),
url('^web-push/$', demo.views.web_push_notification),
url(r'^ckeditor/', include('ckeditor_uploader.urls')),
re_path(r"^grappelli/", include("grappelli.urls")),
re_path("^browser_notification/$", demo.views.browser_notification),
re_path("^web-push/$", demo.views.web_push_notification),
re_path(r"^ckeditor/", include("ckeditor_uploader.urls")),
]


Expand All @@ -30,4 +29,3 @@
document_root=settings.MEDIA_ROOT)
urlpatterns += static(settings.STATIC_URL,
document_root=settings.STATIC_ROOT)

4 changes: 2 additions & 2 deletions docs/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ and app will be work with Django 1.4+.
}
# urls.py
urlpatterns += patterns(
'', url(r'^tinymce/', include('tinymce.urls')),
'', re_path(r'^tinymce/', include('tinymce.urls')),
)


Expand Down Expand Up @@ -224,7 +224,7 @@ Add url patterns into urls.py:
.. code-block:: python

urlpatterns += patterns(
'', url(r'^dbmail/', include('dbmail.urls')),
'', re_path(r'^dbmail/', include('dbmail.urls')),
)


Expand Down
2 changes: 1 addition & 1 deletion docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ Add urls route:

# urls.py
urlpatterns += patterns(
'', url(r'^dbmail/', include('dbmail.urls')),
'', re_path(r'^dbmail/', include('dbmail.urls')),
)


Expand Down
4 changes: 2 additions & 2 deletions docs/web_push.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ After registration you must be have ``API KEY`` and ``APP ID``.
.. code-block:: python

urlpatterns += patterns(
'', url(r'^dbmail/', include('dbmail.urls')),
'', re_path(r'^dbmail/', include('dbmail.urls')),
)


Expand Down Expand Up @@ -257,7 +257,7 @@ Safari examples
.. code-block:: python

urlpatterns += patterns(
'', url(r'^dbmail/', include('dbmail.urls')),
'', re_path(r'^dbmail/', include('dbmail.urls')),
)


Expand Down