commit 1191631c083b096dba41c6b5f0746428c9e51276
author Cory Johns <cjohns@slashdotmedia.com> Fri Jan 10 15:57:40 2014 +0000
committer Cory Johns <cjohns@slashdotmedia.com> Fri Jan 10 15:57:40 2014 +0000
tree 37075c094d7cc118f49eaface63196572d14996e
parent 18b306691c2c02d46b0512266196f995b36da18e

[#7005] Fixed test failures due to detatched c.project

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>

Allura/allura/model/repository.py

diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 1fdbb49..886f4ee 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -619,9 +619,11 @@
         `c.project`.
         '''
         from allura.model import Project
-        session(c.project).flush(c.project)
-        session(c.project).expunge(c.project)
-        c.project = Project.query.get(_id=c.project._id)
+        project_session = session(c.project)
+        if project_session:
+            session(c.project).flush(c.project)
+            session(c.project).expunge(c.project)
+            c.project = Project.query.get(_id=c.project._id)
         self.status = status
         session(self).flush(self)