diff --git a/application/models.py b/application/models.py index 13fb9e5..54500f5 100644 --- a/application/models.py +++ b/application/models.py @@ -8,7 +8,6 @@ class CustomUser(models.Model): user = models.OneToOneField(User, null=True, on_delete=models.CASCADE) tags = TaggableManager() - class Post(models.Model): author = models.ForeignKey('auth.User', on_delete=models.CASCADE) title = models.CharField(max_length=200) diff --git a/application/templates/blog_search_list_view.html b/application/templates/blog_search_list_view.html index 74cc6c8..701af93 100644 --- a/application/templates/blog_search_list_view.html +++ b/application/templates/blog_search_list_view.html @@ -1,32 +1,27 @@ {% extends "base.html" %} {% block content %} {% load taggit_templatetags2_tags %} -{% get_taglist as tags for 'application.post' %} -
- -
-{% include "taggit_templatetags2/tagcanvas_include_js_static.html" %} - -
-
- +{% get_tagcloud as tags for 'application' %} +{% include_tagcloud 'application.Post' %}
- - + +
- + {% for post in posts %} +
+
+ {{ post.published_date }} +
+

+ {{ post.title }} +

+

{{ post.text|linebreaks }}

+ Tags: {% for tag in post.tags.all %} + {{ tag.name }} + {% if not forloop.last %}, {% endif %} {% endfor %}

+ {{ post.author }} +

+
+ {% endfor %}
{% endblock %} \ No newline at end of file diff --git a/application/urls.py b/application/urls.py index c36b183..7a51ca4 100644 --- a/application/urls.py +++ b/application/urls.py @@ -13,6 +13,7 @@ urlpatterns = [ url(r'^taglist/$', views.tag_list, name='tag_list'), url(r'^student/', views.student_page, name='student_page'), url(r'^search/', views.blog_search_list_view, name='blog_search_list_view'), + url(r'^search/result/$', views.blog_search_list_view, name='post_list_by_search'), url(r'^post/(?P\d+)/$', views.post_detail, name='post_detail'), url(r'^post/new/$', views.post_new, name='post_new'), url(r'^post/(?P\d+)/edit/$', views.post_edit, name='post_edit'), diff --git a/application/views.py b/application/views.py index 0ae60cc..79bff29 100644 --- a/application/views.py +++ b/application/views.py @@ -46,11 +46,12 @@ def navlogin(request): @login_required def post_list(request, slug=None): + log = logging.getLogger('mysite') posts = Post.objects.filter(published_date__lte=timezone.now()).order_by('published_date') if slug: tag = get_object_or_404(Tag, slug=slug) - posts= posts.filter(tags__in=[tag]) - page = request.GET.get('page') + posts = posts.filter(tags__in=[tag]) + log.info(posts) return render(request, 'post_list.html', locals()) @@ -152,12 +153,6 @@ def tag_list(request): arr = [] for tag in tags: arr.append(str(tag)) - """ - arr.append(tags) - for tag in tags: - arr.append(str(tag)) - listing = list(arr) - """ return render(request, 'tag_list.html', locals()) class TagSearch(TagCanvasListView): @@ -181,22 +176,14 @@ class TagSearch(TagCanvasListView): cObj = cObj.order_by(var_get_order_by) return cObj -def blog_search_list_view(request): - return render(request, 'blog_search_list_view.html', {}) +def blog_search_list_view(request): + log = logging.getLogger('mysite') + posts = Post.objects.filter(published_date__lte=timezone.now()).order_by('published_date') + if request.method == 'GET': + search_query = request.GET.get('search_box', None) + log.info(search_query) + posts = posts.filter(tags__name__in=[search_query]) + return render(request, 'blog_search_list_view.html', locals()) def tag_cloud(request): return render(request, 'tag_cloud.html', {}) - -""" -@login_required -def post_of_user_list(request): - u= CustomUser.objects.get(user=request.user) - tag =[] - - posts = Post.objects.filter(published_date__lte=timezone.now()).order_by('published_date') - if slug: - tag = get_object_or_404(Tag, slug=slug) - posts= posts.filter(tags__in=[tag]) - page = request.GET.get('page') - return render(request, 'post_list.html', locals()) -""" \ No newline at end of file diff --git a/log.txt b/log.txt index deb2a08..e236439 100644 --- a/log.txt +++ b/log.txt @@ -55,3 +55,83 @@ [19/Oct/2018 18:12:56] INFO [mysite:149] CustomUser object (25) [19/Oct/2018 18:15:29] INFO [mysite:149] CustomUser object (25) [20/Oct/2018 17:20:58] INFO [mysite:149] CustomUser object (25) +[20/Oct/2018 17:54:57] INFO [mysite:149] CustomUser object (25) +[20/Oct/2018 18:03:09] INFO [mysite:149] CustomUser object (25) +[20/Oct/2018 18:18:52] INFO [mysite:149] CustomUser object (25) +[20/Oct/2018 19:14:57] INFO [mysite:183] None +[20/Oct/2018 19:15:00] INFO [mysite:183] test +[20/Oct/2018 19:15:45] INFO [mysite:183] test +[20/Oct/2018 19:17:52] INFO [mysite:183] test +[20/Oct/2018 19:18:31] INFO [mysite:183] test +[20/Oct/2018 19:19:01] INFO [mysite:183] test +[20/Oct/2018 19:20:08] INFO [mysite:184] test +[20/Oct/2018 19:24:45] INFO [mysite:184] None +[20/Oct/2018 19:26:30] INFO [mysite:184] None +[20/Oct/2018 19:29:44] INFO [mysite:184] test +[20/Oct/2018 19:32:09] INFO [mysite:184] test +[20/Oct/2018 19:33:14] INFO [mysite:184] 5 +[20/Oct/2018 22:26:02] INFO [mysite:184] hi +[20/Oct/2018 22:26:09] INFO [mysite:184] 2 +[20/Oct/2018 22:26:39] INFO [mysite:184] 2 +[20/Oct/2018 22:35:49] INFO [mysite:183] 2 +[20/Oct/2018 22:35:55] INFO [mysite:183] 3 +[20/Oct/2018 22:51:06] INFO [mysite:183] hi +[20/Oct/2018 22:53:24] INFO [mysite:183] hi +[20/Oct/2018 22:54:12] INFO [mysite:183] hi +[20/Oct/2018 22:57:38] INFO [mysite:181] , , ]> +[20/Oct/2018 22:57:39] INFO [mysite:184] hi +[20/Oct/2018 22:59:11] INFO [mysite:181] , , ]> +[20/Oct/2018 22:59:11] INFO [mysite:184] hi +[20/Oct/2018 23:01:53] INFO [mysite:181] , , ]> +[20/Oct/2018 23:01:53] INFO [mysite:184] hi +[20/Oct/2018 23:02:06] INFO [mysite:181] , , ]> +[20/Oct/2018 23:02:06] INFO [mysite:184] 5 +[20/Oct/2018 23:02:22] INFO [mysite:181] , , ]> +[20/Oct/2018 23:02:22] INFO [mysite:184] 5 +[20/Oct/2018 23:02:45] INFO [mysite:181] , , ]> +[20/Oct/2018 23:02:45] INFO [mysite:184] 5 +[20/Oct/2018 23:03:07] INFO [mysite:181] , , ]> +[20/Oct/2018 23:03:07] INFO [mysite:184] 5 +[20/Oct/2018 23:03:46] INFO [mysite:181] , , ]> +[20/Oct/2018 23:03:46] INFO [mysite:184] 5 +[20/Oct/2018 23:04:35] INFO [mysite:181] , , ]> +[20/Oct/2018 23:04:35] INFO [mysite:184] 5 +[20/Oct/2018 23:06:49] INFO [mysite:181] , , ]> +[20/Oct/2018 23:06:49] INFO [mysite:184] hi +[20/Oct/2018 23:15:41] INFO [mysite:181] , , ]> +[20/Oct/2018 23:15:41] INFO [mysite:184] hi +[20/Oct/2018 23:17:19] INFO [mysite:181] , , ]> +[20/Oct/2018 23:17:19] INFO [mysite:184] hi +[20/Oct/2018 23:17:38] INFO [mysite:181] , , ]> +[20/Oct/2018 23:17:38] INFO [mysite:184] hi +[20/Oct/2018 23:19:11] INFO [mysite:181] , , ]> +[20/Oct/2018 23:19:11] INFO [mysite:184] hi +[20/Oct/2018 23:24:22] INFO [mysite:181] , , ]> +[20/Oct/2018 23:24:23] INFO [mysite:184] hi +[20/Oct/2018 23:24:42] INFO [mysite:181] , , ]> +[20/Oct/2018 23:24:42] INFO [mysite:184] hi +[20/Oct/2018 23:24:49] INFO [mysite:181] , , ]> +[20/Oct/2018 23:24:49] INFO [mysite:184] hi +[20/Oct/2018 23:24:54] INFO [mysite:181] , , ]> +[20/Oct/2018 23:24:54] INFO [mysite:184] test +[20/Oct/2018 23:25:01] INFO [mysite:181] , , ]> +[20/Oct/2018 23:25:01] INFO [mysite:184] third +[20/Oct/2018 23:28:54] INFO [mysite:182] None +[20/Oct/2018 23:29:00] INFO [mysite:182] hi +[20/Oct/2018 23:29:42] INFO [mysite:182] hi +[20/Oct/2018 23:30:53] INFO [mysite:182] hi +[20/Oct/2018 23:34:29] INFO [mysite:184] hi +[20/Oct/2018 23:34:34] INFO [mysite:54] ]> +[20/Oct/2018 23:38:12] INFO [mysite:54] ]> +[20/Oct/2018 23:38:18] INFO [mysite:184] None +[20/Oct/2018 23:38:25] INFO [mysite:184] hi +[20/Oct/2018 23:40:03] INFO [mysite:184] hi +[20/Oct/2018 23:40:10] INFO [mysite:184] first +[20/Oct/2018 23:41:01] INFO [mysite:184] first +[20/Oct/2018 23:41:12] INFO [mysite:184] h +[20/Oct/2018 23:41:28] INFO [mysite:184] h +[20/Oct/2018 23:41:32] INFO [mysite:184] h +[20/Oct/2018 23:41:38] INFO [mysite:184] h +[20/Oct/2018 23:41:40] INFO [mysite:184] hi +[20/Oct/2018 23:41:50] INFO [mysite:184] hi +[20/Oct/2018 23:41:56] INFO [mysite:184] taggit