Merged in 43600

git-svn-id: svn://10.0.0.236/branches/Groups_20020716_Branch@126221 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugreport%peshkin.net
2002-08-02 05:18:21 +00:00
parent 2fccda6379
commit 5ee25d37a4
27 changed files with 629 additions and 383 deletions

View File

@@ -660,7 +660,7 @@ print qq{
};
SendSQL("SELECT product,description FROM products ORDER BY product");
SendSQL("SELECT name, description FROM products ORDER BY name");
while (MoreSQLData()) {
my ($product, $productdesc) = FetchSQLData();
@@ -725,7 +725,11 @@ components and their associated products:
foreach $product (@products)
{
SendSQL("SELECT value,description FROM components WHERE program=" . SqlQuote($product) . " ORDER BY value");
SendSQL("SELECT components.name, components.description " .
"FROM components, products " .
"WHERE components.product_id = products.id" .
" AND products.name = " . SqlQuote($product) .
"ORDER BY name");
while (MoreSQLData()) {