Use get_current_site instead of Site model

This commit is contained in:
Mark 2015-09-22 21:59:04 +01:00
parent 1d8ffee698
commit 1a3b03b383
3 changed files with 11 additions and 11 deletions

View file

@ -1,5 +1,5 @@
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.sites.models import Site from django.contrib.sites.shortcuts import get_current_site
from django.db.models import Model from django.db.models import Model
from bambu_buffer.exceptions import * from bambu_buffer.exceptions import *
from bambu_buffer.models import BufferToken, BufferProfile, BufferedItem from bambu_buffer.models import BufferToken, BufferProfile, BufferedItem
@ -8,7 +8,7 @@ from datetime import datetime, date
from threading import Thread from threading import Thread
import requests import requests
__version__ = '3.1' __version__ = '3.2'
default_app_config = 'bambu_buffer.apps.BufferConfig' default_app_config = 'bambu_buffer.apps.BufferConfig'
class BufferThread(Thread): class BufferThread(Thread):
@ -39,7 +39,7 @@ def post(item, author, **kwargs):
url = kwargs.get('url') url = kwargs.get('url')
elif isinstance(item, Model): elif isinstance(item, Model):
url = u'http://%s%s' % ( url = u'http://%s%s' % (
Site.objects.get_current().domain, item.get_absolute_url() get_current_site().domain, item.get_absolute_url()
) )
content_type = ContentType.objects.get_for_model(item) content_type = ContentType.objects.get_for_model(item)

View file

@ -1,13 +1,13 @@
from django.contrib.auth.decorators import login_required from bambu_buffer import settings, log
from django.contrib.sites.models import Site from bambu_buffer.models import BufferToken, BufferProfile
from django.core.urlresolvers import reverse
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.contrib.sites.shortcuts import get_current_site
from django.core.urlresolvers import reverse
from django.db import transaction from django.db import transaction
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.template.response import TemplateResponse from django.template.response import TemplateResponse
from django.utils.http import urlencode from django.utils.http import urlencode
from bambu_buffer import settings, log
from bambu_buffer.models import BufferToken, BufferProfile
import requests import requests
@login_required @login_required
@ -23,7 +23,7 @@ def auth(request):
'client_id': settings.CLIENT_ID, 'client_id': settings.CLIENT_ID,
'redirect_uri': 'http%s://%s%s' % ( 'redirect_uri': 'http%s://%s%s' % (
request.is_secure() and 's' or '', request.is_secure() and 's' or '',
Site.objects.get_current(), get_current_site().domain,
reverse('buffer_callback') reverse('buffer_callback')
), ),
'response_type': settings.RESPONSE_TYPE 'response_type': settings.RESPONSE_TYPE
@ -41,7 +41,7 @@ def callback(request):
'client_secret': settings.CLIENT_SECRET, 'client_secret': settings.CLIENT_SECRET,
'redirect_uri': 'http%s://%s%s' % ( 'redirect_uri': 'http%s://%s%s' % (
request.is_secure() and 's' or '', request.is_secure() and 's' or '',
Site.objects.get_current(), get_current_site().domain,
reverse('buffer_callback') reverse('buffer_callback')
), ),
'code': request.GET.get('code'), 'code': request.GET.get('code'),

View file

@ -4,7 +4,7 @@ from os import path
setup( setup(
name = 'bambu-buffer', name = 'bambu-buffer',
version = '3.1', version = '3.2',
description = 'Post to Buffer and manage profile settings through a Django-powered site', description = 'Post to Buffer and manage profile settings through a Django-powered site',
author = 'Steadman', author = 'Steadman',
author_email = 'mark@steadman.io', author_email = 'mark@steadman.io',