Index: openacs-4/packages/assessment/www/admin/catalog-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/catalog-browse.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/catalog-browse.tcl	9 Dec 2004 11:10:57 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/catalog-browse.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -22,7 +22,7 @@
     {page:optional 1}
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/catalog-item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/catalog-item-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/catalog-item-add.tcl	22 Dec 2004 20:52:18 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/catalog-item-add.tcl	29 Dec 2004 09:07:39 -0000	1.4
@@ -17,7 +17,7 @@
     item_ids:optional
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/catalog-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/catalog-search.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/catalog-search.tcl	9 Dec 2004 11:10:58 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/catalog-search.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -14,7 +14,7 @@
     after:integer
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/catalog-section-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/catalog-section-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/catalog-section-add.tcl	22 Dec 2004 20:52:18 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/catalog-section-add.tcl	29 Dec 2004 09:07:39 -0000	1.4
@@ -15,7 +15,7 @@
     section_ids:optional
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/index.adp	5 Dec 2004 17:15:23 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/index.adp	29 Dec 2004 09:07:39 -0000	1.4
@@ -5,6 +5,7 @@
 <a href="@categories_url@cadmin/one-object?object_id=@package_id@">#assessment.admin_categories#</a>
 <p>
 
+<font color=red>QTI DOES NOT WORK AT THIS TIME</font>
 <formtemplate id="form_upload_file"></formtemplate>
 <p>
 <listtemplate name="assessments"></listtemplate>
Index: openacs-4/packages/assessment/www/admin/item-add-display-cb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-cb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-display-cb.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-display-cb.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-display-rb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-rb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-display-rb.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-display-rb.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-display-sa.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-sa.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-display-sa.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-display-sa.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-display-sb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-sb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-add-display-sb.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-add-display-sb.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-display-ta.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-ta.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-display-ta.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-display-ta.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-display-tb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-tb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-display-tb.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-display-tb.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-mc-choices.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-mc-choices.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-mc-choices.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-mc-choices.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -18,7 +18,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-mc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-mc.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/item-add-mc.tcl	22 Dec 2004 20:52:18 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/item-add-mc.tcl	29 Dec 2004 09:07:39 -0000	1.4
@@ -16,7 +16,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-oq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-oq.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-oq.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-oq.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add-sa.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-sa.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-add-sa.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-add-sa.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/item-add.tcl	22 Dec 2004 20:52:18 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/item-add.tcl	29 Dec 2004 09:07:39 -0000	1.6
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-copy.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-copy.tcl	10 Dec 2004 11:42:23 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-copy.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -13,7 +13,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-delete.tcl	14 Nov 2004 16:42:31 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-delete.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-display-cb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-cb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-display-cb.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-display-cb.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-display-rb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-rb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-display-rb.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-display-rb.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-display-sa.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-sa.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-display-sa.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-display-sa.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-display-sb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-sb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-display-sb.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-display-sb.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-display-ta.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-ta.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-display-ta.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-display-ta.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-display-tb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-tb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-display-tb.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-display-tb.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-general.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-general.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/item-edit-general.tcl	22 Dec 2004 20:52:18 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/item-edit-general.tcl	29 Dec 2004 09:07:39 -0000	1.4
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-mc-choices-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-mc-choices-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-mc-choices-delete.tcl	10 Dec 2004 11:42:23 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-mc-choices-delete.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -15,7 +15,7 @@
     choice_id:integer,notnull
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 db_transaction {
     set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id]
Index: openacs-4/packages/assessment/www/admin/item-edit-mc-choices-swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-mc-choices-swap.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-mc-choices-swap.tcl	10 Dec 2004 11:42:23 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-mc-choices-swap.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -18,7 +18,7 @@
     direction:notnull
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 if { $direction=="up" } {
      set next_sort_order [expr { $sort_order - 1 }]
Index: openacs-4/packages/assessment/www/admin/item-edit-mc-choices.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-mc-choices.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-mc-choices.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-mc-choices.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -16,7 +16,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-mc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-mc.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-edit-mc.tcl	22 Dec 2004 20:52:18 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-edit-mc.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -15,7 +15,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-oq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-oq.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-oq.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-oq.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit-sa.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-sa.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-edit-sa.tcl	8 Dec 2004 15:30:34 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-edit-sa.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-edit.tcl	10 Dec 2004 11:42:23 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-edit.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/item-swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-swap.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/item-swap.tcl	14 Nov 2004 16:42:31 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/item-swap.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -16,7 +16,7 @@
     direction:notnull
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 if { $direction=="up" } {
      set next_sort_order [expr { $sort_order - 1 }]
Index: openacs-4/packages/assessment/www/admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/one-a.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/one-a.adp	10 Dec 2004 11:42:23 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/one-a.adp	29 Dec 2004 09:07:39 -0000	1.6
@@ -31,41 +31,41 @@
 
 <tr class="odd">
 	<td><if @assessment_data.anonymous_p@> #assessment.anonymous_users_allow#</if><else>#assessment.reg_users_required#</else> -
-	[ <a href="response-anonymous-toggle?assessment_id=@assessment_id@">
+	[ <a href="assessment-form?assessment_id=@assessment_id@">
 	<if @assessment_data.anonymous_p@>#assessment.make_non_anonymous#</if><else>#assessment.make_anonymous#</else></a> ]</td>
 </tr>
 
 <tr class="odd">
 	<td><if @assessment_data.secure_access_p@> #assessment.secure_access_require#</if><else>#assessment.unsecure_access_allow#</else> -
-	[ <a href="response-secure-toggle?assessment_id=@assessment_id@">
+	[ <a href="assessment-form?assessment_id=@assessment_id@">
 	<if @assessment_data.secure_access_p@>#assessment.make_unsecure#</if><else>#assessment.make_secure#</else></a> ]</td>
 </tr>
 
 <tr class="odd">
 	<td><if @assessment_data.reuse_responses_p@> #assessment.reuse_responses#</if><else>#assessment.dont_reuse_responses#</else> -
-	[ <a href="response-reuse-toggle?assessment_id=@assessment_id@">
+	[ <a href="assessment-form?assessment_id=@assessment_id@">
 	<if @assessment_data.reuse_responses_p@>#assessment.make_not_reuse_respo#</if><else>#assessment.make_reuse_responses#</else></a> ]</td>
 </tr>
 
 <tr class="odd">
 	<td><if @assessment_data.show_item_name_p@> #assessment.show_item_name#</if><else>#assessment.hide_item_name#</else> -
-	[ <a href="response-showiname-toggle?assessment_id=@assessment_id@">
+	[ <a href="assessment-form?assessment_id=@assessment_id@">
 	<if @assessment_data.show_item_name_p@>#assessment.make_hide_item_name#</if><else>#assessment.make_show_item_name#</else></a> ]</td>
 </tr>
 
 <tr class="odd">
 	<td><if @assessment_data.number_tries@ not nil> #assessment.limited_tries#</if><else>#assessment.unlimited_tries#</else> -
-	[ <a href="response-tries-edit?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
+	[ <a href="assesment-form?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
 </tr>
 
 <tr class="odd">
 	<td><if @assessment_data.wait_between_tries@ not nil> #assessment.time_to_wait#</if><else>#assessment.no_waiting#</else> -
-	[ <a href="response-wait-edit?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
+	[ <a href="assessment-form?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
 </tr>
 
 <tr class="odd">
 	<td><if @assessment_data.time_for_response@ not nil> #assessment.time_response#</if><else>#assessment.unlimited_time#</else> -
-	[ <a href="response-time-edit?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
+	[ <a href="assessment-form?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
 </tr>
 
 <tr class="even"><td valign="top" rowspan="2">#assessment.Email_Options#</td><td >@notification_chunk;noquote@</td></tr>
Index: openacs-4/packages/assessment/www/admin/one-a.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/one-a.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/one-a.tcl	22 Dec 2004 20:52:18 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/one-a.tcl	29 Dec 2004 09:07:39 -0000	1.6
@@ -11,7 +11,7 @@
     assessment_id:integer
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/section-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/section-copy.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/section-copy.tcl	10 Dec 2004 11:42:23 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/section-copy.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/section-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/section-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/section-delete.tcl	8 Dec 2004 15:30:34 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/section-delete.tcl	29 Dec 2004 09:07:39 -0000	1.3
@@ -11,7 +11,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/section-display-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/section-display-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/section-display-form.tcl	10 Dec 2004 11:42:24 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/section-display-form.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/section-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/section-form.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/admin/section-form.tcl	22 Dec 2004 20:52:18 -0000	1.5
+++ openacs-4/packages/assessment/www/admin/section-form.tcl	29 Dec 2004 09:07:39 -0000	1.6
@@ -12,7 +12,7 @@
     page_title:onevalue
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
Index: openacs-4/packages/assessment/www/admin/section-swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/section-swap.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/section-swap.tcl	14 Nov 2004 16:43:21 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/section-swap.tcl	29 Dec 2004 09:07:39 -0000	1.2
@@ -15,7 +15,7 @@
     direction:notnull
 }
 
-ad_require_permission $assessment_id admin
+permission::permission_p -object_id $assessment_id -privilege admin
 
 if { $direction=="up" } {
      set next_sort_order [expr { $sort_order - 1 }]