Index: openacs-4/packages/simple-survey/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/index.tcl 18 Feb 2002 20:48:01 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/index.tcl 18 Mar 2002 06:22:33 -0000 1.3 @@ -22,6 +22,7 @@ db_multirow surveys select_surveys "select survey_id, name, enabled_p from survsimp_surveys +where package_id= :package_id order by enabled_p desc, upper(name)" ad_return_template Index: openacs-4/packages/simple-survey/www/admin/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/index.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/index.xql 15 Jun 2001 01:06:39 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/index.xql 18 Mar 2002 06:22:33 -0000 1.2 @@ -5,6 +5,7 @@ select survey_id, name, enabled_p from survsimp_surveys +where package_id= :package_id order by enabled_p desc, upper(name) Index: openacs-4/packages/simple-survey/www/admin/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/simple-survey/www/admin/one.tcl 15 Mar 2002 05:26:42 -0000 1.4 +++ openacs-4/packages/simple-survey/www/admin/one.tcl 18 Mar 2002 06:22:33 -0000 1.5 @@ -16,6 +16,8 @@ ad_require_permission $survey_id survsimp_admin_survey +set package_id [ad_conn package_id] + # Get the survey information. db_1row survsimp_properties "select name as survey_name, short_name, description as survey_description, @@ -26,7 +28,8 @@ from survsimp_surveys, acs_objects, persons where object_id = survey_id and person_id = creation_user -and survey_id = :survey_id" +and survey_id = :survey_id +and package_id= :package_id" if {$survey_response_limit == "One"} { set response_limit_toggle "allow Multiple" Index: openacs-4/packages/simple-survey/www/admin/one.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/one.xql 15 Mar 2002 05:26:42 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/one.xql 18 Mar 2002 06:22:33 -0000 1.3 @@ -13,6 +13,7 @@ where object_id = survey_id and person_id = creation_user and survey_id = :survey_id +and package_id= :package_id