not upgrade to django 4 yet
This commit is contained in:
parent
d201ed1acb
commit
895f5802a3
12 changed files with 14 additions and 15 deletions
|
@ -1,6 +1,6 @@
|
|||
import uuid
|
||||
import django.contrib.postgres.fields as postgres
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.db import models
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.shortcuts import reverse
|
||||
|
|
|
@ -46,7 +46,7 @@ class HstoreInput(forms.Widget):
|
|||
js = ('js/key_value_input.js',)
|
||||
|
||||
|
||||
class JSONField(postgres.JSONField):
|
||||
class JSONField(forms.fields.JSONField):
|
||||
widget = KeyValueInput
|
||||
def to_python(self, value):
|
||||
if not value:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import re
|
||||
from decimal import *
|
||||
from markdown import markdown
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.db import models, IntegrityError
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.db.models import Q
|
||||
|
@ -161,6 +161,8 @@ class UserOwnedEntity(models.Model):
|
|||
abstract = True
|
||||
|
||||
def is_visible_to(self, viewer):
|
||||
if not viewer.is_authenticated:
|
||||
return self.visibility == 0
|
||||
owner = self.owner
|
||||
if owner == viewer:
|
||||
return True
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import uuid
|
||||
import django.contrib.postgres.fields as postgres
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.db import models
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.shortcuts import reverse
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import re
|
||||
from django.db import models
|
||||
from django.shortcuts import reverse
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from markdownx.models import MarkdownxField
|
||||
from markdown import markdown
|
||||
|
||||
|
|
|
@ -104,11 +104,8 @@ def create_app(domain_name):
|
|||
'website': settings.APP_WEBSITE
|
||||
}
|
||||
|
||||
if settings.DEBUG:
|
||||
payload['redirect_uris'] = 'http://localhost/users/OAuth2_login/\nurn:ietf:wg:oauth:2.0:oob'
|
||||
payload['client_name'] = 'test_do_not_authorise'
|
||||
|
||||
response = post(url, data=payload, headers={'User-Agent': 'NeoDB/1.0'})
|
||||
print(payload)
|
||||
return response
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from django.db import models
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
|
||||
class MastodonApplication(models.Model):
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import uuid
|
||||
import django.contrib.postgres.fields as postgres
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.db import models
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.shortcuts import reverse
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import uuid
|
||||
import django.contrib.postgres.fields as postgres
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.db import models
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.shortcuts import reverse
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
dateparser
|
||||
django
|
||||
django~=3.2.10
|
||||
django-hstore
|
||||
django-markdownx
|
||||
django-sass
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
from django.db import models
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
import django.contrib.postgres.fields as postgres
|
||||
from users.models import User
|
||||
from common.utils import GenerateDateUUIDMediaFilePath
|
||||
|
|
|
@ -4,7 +4,7 @@ from django.db import models
|
|||
from django.contrib.auth.models import AbstractUser
|
||||
from django.utils import timezone
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from common.utils import GenerateDateUUIDMediaFilePath
|
||||
from django.conf import settings
|
||||
from mastodon.api import *
|
||||
|
|
Loading…
Add table
Reference in a new issue