From: Chris Ball <cjb@laptop.org>
Date: Mon, 18 Oct 2010 22:53:08 +0000 (-0400)
Subject: Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be
X-Git-Tag: 1.0.0~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59d39826cc04b30520171f56df81067ff582aa2e;p=be.git

Merge branch 'master' of physics.drexel.edu/~wking/code/git/be

Conflicts:
	interfaces/web/web.py
---

59d39826cc04b30520171f56df81067ff582aa2e
diff --cc interfaces/web/web.py
index 2cfdd04,a99758c..dcb205b
--- a/interfaces/web/web.py
+++ b/interfaces/web/web.py
@@@ -77,7 -78,7 +78,11 @@@ class WebInterface
                  if targetbug == None:
                      return []
                  bugs = [bug for bug in get_blocked_by(self.bd, targetbug) if
++<<<<<<< HEAD
 +                        bug.status not in ('closed', 'fixed', 'wontfix')]
++=======
+                         bug.active]
++>>>>>>> 8f1cd4f5eecba8e3322ea6725d71e430520d1585
          return bugs
      
      
@@@ -184,7 -185,13 +189,17 @@@
              bug.severity = severity if severity != 'None' else None
              
          if target:
++<<<<<<< HEAD
 +            add_target(self.bd, bug, target)
++=======
+             current_target = bug_target(self.bd, bug)
+             if current_target:
+                 remove_target(self.bd, bug)
+                 if target != "None":
+                     add_target(self.bd, bug, target)
+             else:
+                 add_target(self.bd, bug, target)
++>>>>>>> 8f1cd4f5eecba8e3322ea6725d71e430520d1585
  
          bug.save()