From ff5a8609f80903e93bd33cf89cf3c1eb716f3b9c Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Sep 29 2016 15:40:12 +0000
Subject: Merge branch 'develop' into 'master' for 0.4.4.11 release


---

diff --git a/blockerbugs/controllers/main.py b/blockerbugs/controllers/main.py
index be9958b..f611fd7 100644
--- a/blockerbugs/controllers/main.py
+++ b/blockerbugs/controllers/main.py
@@ -20,7 +20,7 @@
 # Authors:
 #   Tim Flink <tflink@redhat.com>
 
-from flask import Blueprint, render_template, redirect, url_for, abort, g, flash, make_response
+from flask import Blueprint, render_template, redirect, url_for, abort, g, flash, make_response, request
 import datetime
 from sqlalchemy import func, desc, or_
 import bugzilla
@@ -383,10 +383,12 @@ def propose_bug():
 
     current_milestone = get_current_milestone()
     bugform = BugProposeForm()
-    bugform.bz_user.data = user_info.bz_user
     bugform.milestone.choices = [(m.id, m.name) for m in Milestone.query.filter_by(active=True).order_by(Milestone.id).all()]
     bugform.milestone.default = current_milestone.id
-    bugform.process()
+
+    # we have to process the form after setting the milestone default so that it is properly set
+    # by passing in the request.form, anything submitted as part of a POST will be inserted as form data
+    bugform.process(request.form, bz_user = user_info.bz_user)
 
     if bugform.validate_on_submit():
         app.logger.debug('bugid: %i' % bugform.bugid.data)
diff --git a/blockerbugs/templates/propose_bug.html b/blockerbugs/templates/propose_bug.html
index 005544a..b5f0845 100644
--- a/blockerbugs/templates/propose_bug.html
+++ b/blockerbugs/templates/propose_bug.html
@@ -71,7 +71,7 @@
                             {% endif %}
                             <tr>
                                 <td>{{ bugform.bugid }}</td>
-                                <td>{{ bugform.bz_user(disabled=True) }}</td>
+                                <td>{{ bugform.bz_user(readonly=True) }}</td>
                             </tr>
                     </table>
                 </fieldset>