aboutsummaryrefslogtreecommitdiffstats
path: root/interfaces/web
diff options
context:
space:
mode:
Diffstat (limited to 'interfaces/web')
-rw-r--r--interfaces/web/web.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/interfaces/web/web.py b/interfaces/web/web.py
index a99758c..dcb205b 100644
--- a/interfaces/web/web.py
+++ b/interfaces/web/web.py
@@ -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
@@ -185,6 +189,9 @@ class WebInterface:
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)
@@ -192,6 +199,7 @@ class WebInterface:
add_target(self.bd, bug, target)
else:
add_target(self.bd, bug, target)
+>>>>>>> 8f1cd4f5eecba8e3322ea6725d71e430520d1585
bug.save()