reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Add detail view for speaker and event proposals.

Browse source
This commit is contained in:
Víðir Valberg Guðmundsson 2018-05-20 20:29:56 +02:00
parent b172d678fa
commit c8ab0230cd
3 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/program/templates/proposal_list.html
View file

@ -41,6 +41,9 @@ Proposals | {{ block.super }}
</td> </td>
<td><span class="badge">{{ speakerproposal.proposal_status }}</span></td> <td><span class="badge">{{ speakerproposal.proposal_status }}</span></td>
<td class="text-right"> <td class="text-right">
<a href="{% url 'program:speakerproposal_detail' camp_slug=camp.slug pk=speakerproposal.uuid %}"
class="btn btn-primary btn-sm">
<i class="fas fa-eye"></i><span class="h5"> Detail</span></a>
{% if not camp.read_only %} {% if not camp.read_only %}
<a href="{% url 'program:speakerproposal_update' camp_slug=camp.slug pk=speakerproposal.uuid %}" class="btn btn-primary btn-sm"><i class="fas fa-edit"></i><span class="h5"> Modify</span></a> <a href="{% url 'program:speakerproposal_update' camp_slug=camp.slug pk=speakerproposal.uuid %}" class="btn btn-primary btn-sm"><i class="fas fa-edit"></i><span class="h5"> Modify</span></a>
<a href="{% url 'program:eventproposal_typeselect' camp_slug=camp.slug speaker_uuid=speakerproposal.uuid %}" class="btn btn-success btn-sm" data-toggle="tooltip" title="Click to add a new talk/act/event for '{{ speakerproposal.name }}'"><i class="fas fa-plus"></i><span class="h5"> Add Event</span></a> <a href="{% url 'program:eventproposal_typeselect' camp_slug=camp.slug speaker_uuid=speakerproposal.uuid %}" class="btn btn-success btn-sm" data-toggle="tooltip" title="Click to add a new talk/act/event for '{{ speakerproposal.name }}'"><i class="fas fa-plus"></i><span class="h5"> Add Event</span></a>
@ -81,6 +84,9 @@ Proposals | {{ block.super }}
<td><span class="h4">{{ eventproposal.track.name }}</span></td> <td><span class="h4">{{ eventproposal.track.name }}</span></td>
<td><span class="badge">{{ eventproposal.proposal_status }}</span></td> <td><span class="badge">{{ eventproposal.proposal_status }}</span></td>
<td class='text-right'> <td class='text-right'>
<a href="{% url 'program:eventproposal_detail' camp_slug=camp.slug pk=eventproposal.uuid %}"
class="btn btn-primary btn-sm">
<i class="fas fa-eye"></i><span class="h5"> Detail</span></a>
{% if not camp.read_only %} {% if not camp.read_only %}
<a href="{% url 'program:eventproposal_update' camp_slug=camp.slug pk=eventproposal.uuid %}" class="btn btn-primary btn-sm"><i class="fas fa-edit"></i><span class="h5"> Modify</span></a> <a href="{% url 'program:eventproposal_update' camp_slug=camp.slug pk=eventproposal.uuid %}" class="btn btn-primary btn-sm"><i class="fas fa-edit"></i><span class="h5"> Modify</span></a>
{% if eventproposal.get_available_speakerproposals.exists %} {% if eventproposal.get_available_speakerproposals.exists %}

10
src/program/urls.py
View file

@ -43,6 +43,11 @@ urlpatterns = [
), ),
url( url(
r'^people/', include([ r'^people/', include([
url(
r'^(?P<pk>[a-f0-9-]+)/$',
SpeakerProposalDetailView.as_view(),
name='speakerproposal_detail'
),
url( url(
r'^(?P<pk>[a-f0-9-]+)/update/$', r'^(?P<pk>[a-f0-9-]+)/update/$',
SpeakerProposalUpdateView.as_view(), SpeakerProposalUpdateView.as_view(),
@ -67,6 +72,11 @@ urlpatterns = [
), ),
url( url(
r'^events/', include([ r'^events/', include([
url(
r'^(?P<pk>[a-f0-9-]+)/$',
EventProposalDetailView.as_view(),
name='eventproposal_detail'
),
url( url(
r'^(?P<pk>[a-f0-9-]+)/edit/$', r'^(?P<pk>[a-f0-9-]+)/edit/$',
EventProposalUpdateView.as_view(), EventProposalUpdateView.as_view(),

10
src/program/views.py
View file

@ -202,6 +202,12 @@ class SpeakerProposalDeleteView(LoginRequiredMixin, CampViewMixin, EnsureWritabl
return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug}) return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug})
class SpeakerProposalDetailView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureUserOwnsProposalMixin, EnsureCFPOpenMixin, DetailView):
model = models.SpeakerProposal
template_name = 'speakerproposal_detail.html'
################################################################################################### ###################################################################################################
# eventproposal views # eventproposal views
@ -370,6 +376,10 @@ class EventProposalDeleteView(LoginRequiredMixin, CampViewMixin, EnsureWritableC
return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug}) return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug})
class EventProposalDetailView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureUserOwnsProposalMixin, EnsureCFPOpenMixin, DetailView):
model = models.EventProposal
template_name = 'eventproposal_detail.html'
################################################################################################### ###################################################################################################
# combined proposal views # combined proposal views