diff --git a/accounts/models.py b/accounts/models.py index 826e027..a731eaa 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -1,7 +1,7 @@ from django.db import models from django.contrib.auth.models import AbstractUser, BaseUserManager from django.core.urlresolvers import reverse - +from django.contrib.sites.models import Site # Create your models here. @@ -16,13 +16,20 @@ class BlogUserManager(BaseUserManager): return user """ + class BlogUser(AbstractUser): nickname = models.CharField('昵称', max_length=50, blank=True) mugshot = models.ImageField('头像', upload_to='upload/mugshots', blank=True) - #objects = BlogUserManager() + + # objects = BlogUserManager() def get_absolute_url(self): return reverse('blog:author_detail', kwargs={'author_name': self.username}) def __str__(self): return self.email + + def get_full_url(self): + site = Site.objects.get_current().domain + url = "https://{site}{path}".format(site=site, path=self.get_absolute_url()) + return url diff --git a/templates/blog/article_detail.html b/templates/blog/article_detail.html index ec32c06..68c70b2 100755 --- a/templates/blog/article_detail.html +++ b/templates/blog/article_detail.html @@ -6,10 +6,10 @@ + content="{{ article.get_full_url }}"/> - + {% for t in article.tags.all %} diff --git a/templates/blog/article_index.html b/templates/blog/article_index.html index 0161f26..e6e3c4e 100644 --- a/templates/blog/article_index.html +++ b/templates/blog/article_index.html @@ -2,7 +2,7 @@ {% load blog_tags %} {% block header %} {% if tag_name %} -