From 5bcb0906e94cf3b0e4a91b21676a78dcd3bbeb90 Mon Sep 17 00:00:00 2001
From: "ghendricks%novell.com"
 <ghendricks%novell.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 20 Nov 2006 17:09:26 +0000
Subject: [PATCH] Subelements weren't checking for properties as children

git-svn-id: svn://10.0.0.236/trunk@215469 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../Bugzilla/Testopia/Environment/Element.pm    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/Environment/Element.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/Environment/Element.pm
index 6d7c9db6757..b1d2fe72447 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/Environment/Element.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/Environment/Element.pm
@@ -232,12 +232,19 @@ sub check_for_children{
     my $dbh = Bugzilla->dbh;
     my $self = shift;
     
-    my ($used) = $dbh->selectrow_array(qq{
-    	SELECT 1 
-          FROM test_environment_element 
-         WHERE parent_id = ? },undef,$self->{'element_id'});
+    my ($has_element) = $dbh->selectrow_array(
+    	"SELECT 1 
+           FROM test_environment_element 
+          WHERE parent_id = ?",
+         undef, $self->{'element_id'});
 
-    return $used;             
+    my ($has_property) = $dbh->selectrow_array(
+    	"SELECT 1 
+           FROM test_environment_property 
+          WHERE element_id = ?",
+         undef, $self->{'element_id'});
+
+    return $has_element || $has_property;             
 }
 
 sub children_to_json{