8000 Stop using django.contrib.comments and django_comments_xtd by berkerpeksag · Pull Request #981 · python/pythondotorg · GitHub
[go: up one dir, main page]
Skip to content

Stop using django.contrib.comments and django_comments_xtd #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Aug 6, 2017
Merged

Stop using django.contrib.comments and django_comments_xtd #981

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f0cce93
Stop using django.contrib.comments and django_comments_xtd
berkerpeksag Aug 5, 2016
b46e90d
Raise 401 if a non-admin user tries to approve a job
berkerpeksag Aug 5, 2016
fac168e
Add jobs_board_admin context variable
berkerpeksag Aug 5, 2016
b48604c
Don't show canned responses to normal users
berkerpeksag Aug 5, 2016
d4dfbeb
Set creator and url field automatically in JobFactory
berkerpeksag Aug 4, 2017
f6bb5a8
Remove JobDetailReview
berkerpeksag Aug 4, 2017
8a5675e
Simplify JobListMine and JobDetail views
berkerpeksag Aug 4, 2017
f325dd0
Improve UX of job review views
berkerpeksag Aug 4, 2017
3665d81
Fix <title> when editing a job in job_form.html
berkerpeksag Aug 4, 2017
0a6179e
Remove unnecessary branch in JobCreate.get_form_kwargs()
berkerpeksag Aug 4, 2017
f02b962
Increase test coverage of Job views tip %95
berkerpeksag Aug 4, 2017
07bf6a1
Don't send email to job submitter for their own comment
berkerpeksag Aug 5, 2017
234dfde
Show commenter's username if they don't have full name set
berkerpeksag Aug 5, 2017
f6178c1
Don't show review comments when a job is in preview mode
berkerpeksag Aug 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove JobDetailReview
  • Loading branch information
@berkerpeksag
berkerpeksag committed Aug 6, 2017
commit f6bb5a838ec3cd99eabeee94d49bc65bbae250aa
1 change: 0 additions & 1 deletion jobs/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
url(r'^types/$', views.JobTypes.as_view(), name='job_types'),
url(r'^categories/$', views.JobCategories.as_view(), name='job_categories'),
url(r'^(?P<pk>\d+)/edit/$', views.JobEdit.as_view(), name='job_edit'),
url(r'^(?P<pk>\d+)/review/$', views.JobDetailReview.as_view(), name='job_detail_review'),
url(r'^(?P<pk>\d+)/preview/$', views.JobPreview.as_view(), name='job_preview'),
url(r'^(?P<pk>\d+)/$', views.JobDetail.as_view(), name='job_detail'),
]
24 changes: 1 addition & 23 deletions jobs/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,34 +300,12 @@ def get_context_data(self, **kwargs):
return ctx


class JobDetailReview(LoginRequiredMixin, JobBoardAdminRequiredMixin, JobDetail):

def get_queryset(self):
""" Only staff and creator can review """
if self.request.user.is_staff:
return Job.objects.select_related()
else:
raise Http404()

def get_context_data(self, **kwargs):
ctx = super().get_context_data(
user_can_edit=(
self.object.creator == self.request.user
or self.request.user.is_staff
),
under_review=True,
job_review_form=JobReviewCommentForm(initial={'job': self.object}),
)
ctx.update(kwargs)
return ctx


class JobReviewCommentCreate(LoginRequiredMixin, JobMixin, CreateView):
model = JobReviewComment
form_class = JobReviewCommentForm

def get_success_url(self):
return reverse('jobs:job_detail_review', kwargs={'pk': self.request.POST.get('job')})
return reverse('jobs:job_detail', kwargs={'pk': self.request.POST.get('job')})

def form_valid(self, form):
if (self.request.user.username != form.instance.job.creator.username and not
Expand Down
4 changes: 2 additions & 2 deletions templates/jobs/job_review.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>Job Listing Reviews</h1>
<tbody>
{% for object in object_list %}
<tr>
<td><a href="{% url 'jobs:job_detail_review' pk=object.pk %}">{{ object.pk }}</a></td>
<td><a href="{% url 'jobs:job_detail' pk=object.pk %}">{{ object.pk }}</a></td>
<td>
<p><strong>Title:</strong> {{ object.job_title }}</p>
<p><strong>Company:</strong> {{ object.company_name }}</p>
Expand All @@ -33,7 +33,7 @@ <h1>Job Listing Reviews</h1>
{% csrf_token %}
<input type="hidden" name="job_id" value="{{ object.id }}">
<div>
<a class="button" href="{% url 'jobs:job_detail_review' pk=object.pk %}">Review</a>
<a class="button" href="{% url 'jobs:job_detail' pk=object.pk %}">Review</a>
<a class="button" href="{% url 'jobs:job_edit' pk=object.pk %}?next={{request.get_full_path}}">Edit</a>
<button name="action" value="approve">Approve</button>
<button name="action" value="reject">Reject</button>
Expand Down
0