Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/admin/index.adp	28 Feb 2005 18:22:35 -0000	1.21
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	4 Apr 2005 17:47:21 -0000	1.22
@@ -21,7 +21,7 @@
   <li><a href=host-node-map/>Host-Node Map</a>
   <li><a href=object-types/>Object Types</a>
   <if @asm_p@ eq 1>
-  <li><a href=set-reg-assessment> Admin Registration Assessment </a>
+  <li><a href=set-reg-assessment> #acs-subsite.reg_asm_link#</a>
   </if>
 </ul>
 
Index: openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/set-reg-assessment.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.adp	28 Feb 2005 18:15:13 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.adp	4 Apr 2005 17:47:21 -0000	1.2
@@ -5,6 +5,12 @@
 	#acs-subsite.no_assessment#
 </if>
 <else>
+<a href="@new_url@asm-admin/assessment-form" class="button">#acs-subsite.create_asm#</a>
+<if @assessment_id@ ne 0>
+<a href="@url@asm-admin/one-a?assessment_id=@assessment_id@" class="button">#acs-subsite.edit_asm#</a>
+</if>
+<br>
+<br>
 <formtemplate id="get_assessment"></formtemplate>
 </else>
 
Index: openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/set-reg-assessment.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.tcl	4 Mar 2005 22:11:30 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.tcl	4 Apr 2005 17:47:21 -0000	1.3
@@ -6,24 +6,30 @@
     @cvs-id $Id: 
 }
 
+set value [parameter::get -parameter AsmForRegisterId]
+set assessment_id $value
 set install_p [apm_package_installed_p "assessment"]
 set mount_p [site_node::get_package_url -package_key assessment]
-
 if {$install_p == 0 || $mount_p == ""} {
     ad_return_complaint 1 "Assessment Package is not installed or mounted"
     ad_script_abort
 }
+set url ""
+if { ![string eq $assessment_id 0]} {
+set package_id [db_string package_id {}]
+set url [apm_package_url_from_id $package_id]
+}
 
+set instance_id [ db_list_of_lists get_instance_id {}]
+set new_url [apm_package_url_from_id [lindex $instance_id 0]]
 set page_title "[ad_conn instance_name] Set the assessment for registration"
 
 set context [list "Set the assessment for registration"]
 
 set subsite_id [ad_conn subsite_id]
 
 
-set value [parameter::get -parameter AsmForRegisterId]
 
-
 set assessments [db_list_of_lists get_all_assessments {}]
 lappend assessments [list "[_ acs-subsite.none]" 0]
 
@@ -38,6 +44,7 @@
     {value $value}} 
 } -on_submit {
     parameter::set_value -package_id [ad_conn package_id] -parameter AsmForRegisterId -value $assessment_id
+    ad_returnredirect "set-reg-assessment"
 }
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/set-reg-assessment.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.xql	31 Mar 2005 17:44:09 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/set-reg-assessment.xql	4 Apr 2005 17:47:21 -0000	1.3
@@ -17,6 +17,19 @@
       </querytext>
 </fullquery>
 
+<fullquery name="package_id">
+      <querytext>
+      
+      select package_id from cr_folders where folder_id=(select context_id from acs_objects where object_id=:assessment_id)
+    
+      </querytext>
+</fullquery>
+
+<fullquery name="get_instance_id">
+      <querytext>
+      select package_id from apm_packages where package_key='assessment'
+      </querytext>
+</fullquery>
  
 </queryset>