Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	21 Nov 2007 14:08:43 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	5 Jan 2010 01:34:54 -0000	1.4
@@ -8,66 +8,29 @@
     dependency_type
 }
 
-db_1row apm_package_info_by_version_id_and_package {
-    select p.package_key, p.package_uri, 
-    p.pretty_name, v.version_name
-    from   apm_package_types p, apm_package_versions v
-    where  v.version_id = :version_id
-    and    v.package_key = p.package_key
-}
+db_1row apm_package_info_by_version_id_and_package {}
 
 set dependency_id [db_nextval acs_object_id_seq] 
 
 doc_body_append "[apm_header -form "action=version-dependency-add-2" [list "version-view?version_id=$version_id" "$pretty_name $version_name"] [list "version-dependencies?version_id=$version_id" "Dependencies"] "Add a Dependency"]
 
-[export_form_vars version_id dependency_type dependency_id]
+[export_vars -form {version_id dependency_type dependency_id {our_package_key $package_key}}]
 
-<script type=\"text/javascript\">
-// Invoked when the user selects a service from the select list.
-function selectService(which) {
-    // Select the radio button next to the list of services.
-    var form = document.forms\[0\];
-    form.which\[0\].checked = 1;
-
-    // Fill in the text fields according to the service selected (the URL
-    // is before the semicolon; the version number is after it)
-    value = which.options\[which.selectedIndex\].value;
-    semi = value.indexOf(';');
-    form.service_uri.value = value.substring(0, semi);
-    form.service_version.value = value.substring(semi + 1);
-}
-</script>
-
-<blockquote>
-<table cellspacing=0 cellpadding=0>
-<tr><td><input type=radio name=which value=service>&nbsp;</td><td>$pretty_name ${dependency_type}s the following service:</td></tr>
-
-<tr><td></td><td>
-<select name=service_select size=8 onChange=\"selectService(this)\">
+$pretty_name ${dependency_type}s the following service:
+<p>
+<select name=service size=8>
 "
 
-db_foreach apm_all_service_uri {
-    select distinct service_uri, service_version
-    from   apm_package_dependencies
-    order by service_uri, apm_package_version.sortable_version_name(service_version)
-} {
-    doc_body_append "<option value=\"$service_uri;$service_version\">$service_uri, version $service_version\n"
+db_foreach apm_packages {} {
+    doc_body_append "<option value=\"$package_key;$version_name\">$package_key, version $version_name\n"
 }
 
 
 db_release_unused_handles
-doc_body_append "</select>
-</td></tr>
 
-<tr><td><input type=radio name=which value=other>&nbsp;</td><td>$pretty_name ${dependency_type}s the following other service:</td></tr>
-<tr><td></td><td><input name=service_uri size=60 onFocus=\"form.which\[1\].checked = 1\">, version <input name=service_version size=10 onFocus=\"form.which\[1\].checked = 1\"></td></tr>
-
-</table>
-</blockquote>
-
-<center>
+doc_body_append "</select>
+<br>
 <input type=submit value=\"Add Dependency\">
-</center>
 
 [ad_footer]
 "