Merge branch 'master' into private-slides

palnabarun · web-flow · commit 207e52df4da9 · 2020-08-05T21:30:36.000+05:30
diff --git a/junction/proposals/forms.py b/junction/proposals/forms.py
@@ -141,6 +141,12 @@ class ProposalForm(forms.Form):
         required=False,
         help_text="Say something about yourself, work etc...",
     )
+    is_first_time_speaker = forms.BooleanField(
+        label="First Time Speaker",
+        required=False,
+        help_text="Please mark, if you are a first time speaker for any conference or meetup,"
+        "not just for PyCon India",
+    )
     speaker_links = forms.CharField(
         label="Speaker Links",
         widget=PagedownWidget(show_preview=True),
@@ -171,6 +177,7 @@ def populate_form_for_update(self, proposal):
                 "private_content_urls": proposal.private_content_urls,
                 "speaker_info": proposal.speaker_info,
                 "speaker_links": proposal.speaker_links,
+                "is_first_time_speaker": proposal.is_first_time_speaker,
                 "status": proposal.status,
                 "proposal_section": proposal.proposal_section.pk,
                 "proposal_type": proposal.proposal_type.pk,
diff --git a/junction/proposals/migrations/0029_auto_20200707_0844.py b/junction/proposals/migrations/0029_auto_20200707_0844.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2020-07-07 03:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("proposals", "0028_auto_20200617_2337"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalproposal",
+            name="is_first_time_speaker",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="proposal",
+            name="is_first_time_speaker",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/junction/proposals/models.py b/junction/proposals/models.py
@@ -111,6 +111,7 @@ class Proposal(TimeAuditModel):
     )
     speaker_info = models.TextField(blank=True, default="")
     speaker_links = models.TextField(blank=True, default="")
+    is_first_time_speaker = models.BooleanField(blank=True, default=False)
     status = models.PositiveSmallIntegerField(
         choices=ProposalStatus.CHOICES, default=ProposalStatus.DRAFT
     )
diff --git a/junction/proposals/views.py b/junction/proposals/views.py
@@ -174,6 +174,7 @@ def create_proposal(request, conference_slug):
         private_content_urls=form.cleaned_data["private_content_urls"],
         speaker_info=form.cleaned_data["speaker_info"],
         speaker_links=form.cleaned_data["speaker_links"],
+        is_first_time_speaker=form.cleaned_data["is_first_time_speaker"],
         status=form.cleaned_data["status"],
         proposal_type_id=form.cleaned_data["proposal_type"],
         proposal_section_id=form.cleaned_data["proposal_section"],
@@ -326,6 +327,7 @@ def update_proposal(request, conference_slug, slug):
     proposal.private_content_urls = form.cleaned_data["private_content_urls"]
     proposal.speaker_info = form.cleaned_data["speaker_info"]
     proposal.speaker_links = form.cleaned_data["speaker_links"]
+    proposal.is_first_time_speaker = form.cleaned_data["is_first_time_speaker"]
     proposal.status = form.cleaned_data["status"]
     proposal.proposal_type_id = form.cleaned_data["proposal_type"]
     proposal.proposal_section_id = form.cleaned_data["proposal_section"]
diff --git a/junction/templates/profiles/dashboard.html b/junction/templates/profiles/dashboard.html
@@ -17,7 +17,8 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% breadcrumb "Dashboard" "user-proposals-list" %}
+    <!-- breadcrumb takes 2 mandatory arguments (label & viewname)  -->
+    {% breadcrumb "Dashboard" "dummy-url" %}
 {% endblock %}
 
 {% block navbar_logo %}
diff --git a/junction/templates/profiles/userprofile.html b/junction/templates/profiles/userprofile.html
@@ -17,8 +17,9 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% breadcrumb "Dashboard" "user-proposals-list" %}
-    {% breadcrumb "Profile" "user-profile"%}
+    <!-- breadcrumb takes 2 mandatory arguments (label & viewname)  -->
+    {% breadcrumb "Dashboard" "/profiles" %}
+    {% breadcrumb "Profile" "dummy-url" %}
 {% endblock %}
 
 {% block navbar_logo %}
diff --git a/junction/templates/proposals/detail/base.html b/junction/templates/proposals/detail/base.html
@@ -79,6 +79,10 @@ <h1 class="proposal-title">
                 </div>
             {% endif %}
 
+            {% if is_author or is_reviewer or user.is_superuser and proposal.is_first_time_speaker %}
+            <span class="label label-info">First Time Speaker</span>
+            {% endif %}
+
             {% comment %}
               {% if is_reviewer %}
                 <a class="tag label label-proposal-type" href="{{ proposal.get_review_url }}">Review proposal</a>

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ class Proposal(TimeAuditModel):`
`111`	`111`	`)`
`112`	`112`	`speaker_info = models.TextField(blank=True, default="")`
`113`	`113`	`speaker_links = models.TextField(blank=True, default="")`
	`114`	`+ is_first_time_speaker = models.BooleanField(blank=True, default=False)`
`114`	`115`	`status = models.PositiveSmallIntegerField(`
`115`	`116`	`choices=ProposalStatus.CHOICES, default=ProposalStatus.DRAFT`
`116`	`117`	`)`