From 2ec773fe395e9634eac468600944ef8229abf2b7 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Jul 08 2013 17:01:33 +0000
Subject: Merge branch 'hotfix/t390-admin-milestonechangefix' into develop


---

diff --git a/blockerbugs.spec b/blockerbugs.spec
index f3628ab..726fa69 100644
--- a/blockerbugs.spec
+++ b/blockerbugs.spec
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           blockerbugs
-Version:        0.3.0.2
+Version:        0.3.0.3
 Release:        1%{?dist}
 Summary:        Fedora QA Blocker Tracking Application
 
@@ -120,6 +120,9 @@ cp -v docs/_build/man/*.1 %{buildroot}/%{_mandir}/man1/
 
 
 %changelog
+* Mon Jul 8 2013 Tim Flink <tflink@fedoraproject.org> - 0.3.0.3-1
+- fixing crash on milestone modification (#390)
+
 * Thu May 30 2013 Tim Flink <tflink@fedoraproject.org> - 0.3.0.2-1
 - fixing sync trigger on component rename (#330) and full sync
 
diff --git a/blockerbugs/__init__.py b/blockerbugs/__init__.py
index 798fc6e..c0f2984 100644
--- a/blockerbugs/__init__.py
+++ b/blockerbugs/__init__.py
@@ -6,7 +6,7 @@ import logging.handlers
 import os
 
 # the version as used in setup.py and docs
-__version__ = "0.3.0.2"
+__version__ = "0.3.0.3"
 
 
 # Flask App
diff --git a/blockerbugs/controllers/admin.py b/blockerbugs/controllers/admin.py
index 1ca872a..4ce6c9f 100644
--- a/blockerbugs/controllers/admin.py
+++ b/blockerbugs/controllers/admin.py
@@ -147,17 +147,15 @@ def modify_milestone(number, version):
         selected_release = Release.query.filter_by(id=rel_form.release.data).first()
         if milestone.release != selected_release:
             milestone.release = selected_release
-        selected_succeeds = Milestone.query.filter_by(id=rel_form.succeeds.data).first()
-        if milestone.succeeds != selected_succeeds:
-            milestone.succeeds = selected_succeeds
         if milestone.blocker_tracker != rel_form.blocker_tracker.data:
             milestone.blocker_tracker = rel_form.blocker_tracker.data
         if milestone.fe_tracker != rel_form.fe_tracker.data:
             milestone.fe_tracker = rel_form.fe_tracker.data
-        #rel_form.populate_obj(milestone)
-        #db.session.add(milestone)
-        #db.session.commit()
-        #return redirect(url_for('.admin_index'))
+        if milestone.active != rel_form.active.data:
+            milestone.active = rel_form.active.data
+        db.session.add(milestone)
+        db.session.commit()
+        return redirect(url_for('.admin_index'))
     return render_template('admin/modify_release.html', form=rel_form, rel_num=release.number)