Skip to content

Commit d7fac06

Browse files
authored
Merge pull request #134 from Prakhar19999/testing
Fix blog App
2 parents 1220819 + da9ccbb commit d7fac06

11 files changed

+19
-23
lines changed

website/blog/forms.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class Postform(forms.ModelForm):
1414

1515
def clean_description(self):
1616
data = self.cleaned_data['description']
17-
print(len(data)<20)
1817
if len(data)<20:
1918
raise forms.ValidationError("Description too Short! Less than 20 words!")
2019
data = markdownify(data)

website/blog/templates/blog/new_blog_entry_email.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
A new Blog has been Posted in Blogs:
4+
A new Post has been shared on RECursion Blog:
55

66
{{ post.title }}
7-
http://{{ domain }}{% url 'blog:detail_posts' post.id %}
7+
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}
88

99
Sincerely,
1010
RECursion Team

website/blog/templates/blog/new_commententry_email.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
An existing Blog has been Commented in Blogs:
4+
An existing Post has been Commented upon on RECursion Blog:
55

66
{{ post.title }}
7-
http://{{ domain }}{% url 'blog:detail_posts' post.id %}
7+
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}
88

99
Sincerely,
1010
RECursion Team

website/blog/templates/blog/new_reply_comment_entry_email.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
An existing Comment to an existing Blog has been Commented upon in Blogs:
4+
An existing Comment to an existing Post has been Commented upon on RECursion Blog:
55

66
{{ post.title }}
7-
http://{{ domain }}{% url 'blog:detail_posts' post.id %}
7+
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}
88

99
Sincerely,
1010
RECursion Team

website/blog/templates/blog/new_reply_entry_email.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
An existing Blog has been Commented in Blogs:
4+
An existing Post has been Commented upon on RECursion Blog:
55

66
{{ post.title }}
7-
http://{{ domain }}{% url 'blog:detail_posts' post.id %}
7+
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}
88

99
Sincerely,
1010
RECursion Team

website/blog/templates/blog/reply_update_email.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
An existing Blog has been Commented in Blogs:
4+
An existing Post has been Commented upon on RECursion Blog:
55

66
{{ post.title }}
77
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}

website/blog/templates/blog/update_blog_email.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
An existing Blog has been Updated in Blogs:
4+
An existing Post has been Updated on RECursion Blog:
55

66
{{ post.title }}
77
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}

website/blog/templates/blog/update_reply_comment_email.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
An existing Comment to an Existing Comment to an existing Blog has been Updated in Blogs:
4+
An existing Comment to an Existing Comment to an existing Post has been Updated on RECursion Blog:
55

66
{{ post.title }}
7-
http://{{ domain }}{% url 'blog:detail_posts' post.id %}
7+
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}
88

99
Sincerely,
1010
RECursion Team

website/blog/templates/blog/updatecomment_email.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% autoescape off %}
22
Hi {{ user.username }},
33

4-
An existing Comment to an existing Blog has been Updated in Blogs:
4+
An existing Comment to an existing Post has been Updated on RECursion Blog:
55

66
{{ post.title }}
77
http://{{ domain }}{% url 'blog:detail_blogs' post.id %}

website/blog/views.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def list_blogs(request):
130130
key_req = search.cleaned_data
131131
key = key_req.get('key')
132132
return HttpResponseRedirect(reverse('blog:search_blog', args=(key,)))
133-
posts = Posts.objects.all()
133+
posts = Posts.objects.all().order_by('-created_at')
134134
paginator = Paginator(posts, 5)
135135
page = request.GET.get('page')
136136
try:
@@ -453,7 +453,6 @@ def add_comment(request, id):
453453

454454
@login_required
455455
def update_comment(request, id):
456-
print(id)
457456
try:
458457
comment =get_object_or_404(Comment, pk=id)
459458
post=comment.post
@@ -519,14 +518,12 @@ def edit_postlike(request, id):
519518
postlike = PostLikes.objects.get(post=post, user=user)
520519
if postlike.value == True:
521520
postlike.delete()
522-
print("postlike_deleted")
523521
count=PostLikes.objects.filter(post=post,value=True).count()-PostLikes.objects.filter(post=post,value=False).count()
524522
return HttpResponse(json.dumps({
525523
'count':count,
526524
'Success':'postlike_deleted'
527525
}))
528526
else:
529-
print("postlike")
530527
postlike.delete()
531528
postlike=PostLikes.objects.create(post=post,user=user,value=True)
532529
postlike.save()
@@ -539,7 +536,7 @@ def edit_postlike(request, id):
539536
else:
540537
postlike=PostLikes.objects.create(post=post,user=user,value=True)
541538
postlike.save()
542-
print("postlike_created")
539+
("postlike_created")
543540
count=PostLikes.objects.filter(post=post,value=True).count()-PostLikes.objects.filter(post=post,value=False).count()
544541
return HttpResponse(json.dumps({
545542
'count':count,
@@ -558,7 +555,7 @@ def edit_postdislike(request, id):
558555
postlike = PostLikes.objects.get(post=post, user=user)
559556
if postlike.value == False:
560557
postlike.delete()
561-
print("postdislike_deleted")
558+
("postdislike_deleted")
562559
count=PostLikes.objects.filter(post=post,value=True).count()-PostLikes.objects.filter(post=post,value=False).count()
563560
return HttpResponse(json.dumps({
564561
'count':count,

0 commit comments

Comments
 (0)