Fix duplicate avatar source field (#295)

* Fix duplicate avatar_source field in Profile form

* Fix coding style

Author: hongquan

src/pretalx/cfp/templates/cfp/event/user_profile.html

@@ -33,6 +33,8 @@ <h2>{% translate "Your Profile" %}</h2>
         {% if request.event.cfp.request_avatar %}
             {% include "common/avatar.html" with user=request.user form=profile_form %}
         {% endif %}
+        {% if profile_form.avatar_source %}{{ profile_form.avatar_source.as_field_group }}{% endif %}
+        {% if profile_form.avatar_license %}{{ profile_form.avatar_license.as_field_group }}{% endif %}
         {% if profile_form.availabilities %}
             {% include "common/availabilities.html" %}
             {{ profile_form.availabilities.as_field_group }}

src/pretalx/cfp/views/wizard.py

@@ -13,6 +13,8 @@
 from pretalx.common.exceptions import SendMailException
 from pretalx.common.text.phrases import phrases
 
+logger = logging.getLogger(__name__)
+
 
 class SubmitStartView(EventPageMixin, View):
     @staticmethod
@@ -57,6 +59,7 @@ def dispatch(self, request, *args, **kwargs):
         if getattr(step, "is_before", False):  # The current step URL is incorrect
             raise Http404()
         handler = getattr(step, request.method.lower(), self.http_method_not_allowed)
+        logger.debug("Handler: %s", handler)
         result = handler(request)
 
         if request.method == "POST" and request.POST.get("action", "submit") == "draft":

src/pretalx/common/templates/common/avatar.html

@@ -26,18 +26,6 @@
         </div>
     </div>
 </div>
-<div class="avatar-form form-group row">
-    <label class="col-md-3 col-form-label">{{ form.avatar_source.field.label }}</label>
-    <div class="col-md-9">
-        {{ form.avatar_source.as_widget }}
-    </div>
-</div>
-<div class="avatar-form form-group row">
-    <label class="col-md-3 col-form-label">{{ form.avatar_license.field.label }}</label>
-    <div class="col-md-9">
-        {{ form.avatar_license.as_widget }}
-    </div>
-</div>
 
 {% compress css %}
     <link rel="stylesheet" href="{% static "common/css/avatar.css" %}">

src/pretalx/orga/templates/orga/speaker/form.html

@@ -77,6 +77,8 @@ <h5>
         {% if form.avatar %}
             {% include "common/avatar.html" with user=form.instance.user form=form %}
         {% endif %}
+        {% if form.avatar_source %}{{ form.avatar_source.as_field_group }}{% endif %}
+        {% if form.avatar_license %}{{ form.avatar_license.as_field_group }}{% endif %}
 
         {% if form.biography %}
             {{ form.biography.as_field_group }}