Index: openacs-4/packages/cms/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/form-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/tcl/form-procs.tcl 27 May 2001 04:39:19 -0000 1.2
@@ -519,7 +519,7 @@
# id_value is the revision_id
proc content::insert_element_data {
- db form_name content_type exclusion_list id_value \
+ form_name content_type exclusion_list id_value \
{suffix ""} {extra_where ""}
} {
@@ -557,7 +557,7 @@
set last_table ""
set last_id_column ""
- template::query rows multirow $query -db $db
+ template::query rows multirow $query
for { set i 1 } { $i <= ${rows:rowcount} } { incr i } {
upvar 0 "rows:${i}" row
Index: openacs-4/packages/cms/tcl/pagination-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/pagination-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/pagination-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/tcl/pagination-procs.tcl 27 May 2001 04:39:19 -0000 1.2
@@ -55,14 +55,14 @@
# @param db A database handle
-proc pagination::get_total_pages { db } {
+proc pagination::get_total_pages {} {
uplevel {
template::query total_pages onevalue "
select
ceil(count(*) / [pagination::get_rows_per_page] )
from
($sql)
- " -db $db
+ "
return $total_pages
}
Index: openacs-4/packages/cms/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/publish-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/publish-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/tcl/publish-procs.tcl 27 May 2001 04:39:19 -0000 1.2
@@ -1294,7 +1294,7 @@
# @see proc publish::publish_revision
# @see proc publish::unpublish_item
-proc publish::set_publish_status { db item_id new_status {revision_id ""} } {
+proc publish::set_publish_status { item_id new_status {revision_id ""} } {
switch $new_status {
Index: openacs-4/packages/cms/tcl/user-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/user-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/tcl/user-procs.tcl 27 May 2001 04:39:19 -0000 1.2
@@ -11,7 +11,7 @@
# set the ad_user_login cookie
- proc login { db user_id } {
+ proc login { user_id } {
ad_user_login -forever $user_id
@@ -52,10 +52,10 @@
# a cms admin exists if a user has the 'cm_admin' privilege
# on the CMS pages root folder
- proc cms_admin_exists { db } {
+ proc cms_admin_exists {} {
template::query admin_exists onevalue "
- select content_permission.cm_admin_exists from dual" -db $db
+ select content_permission.cm_admin_exists from dual"
if { [string equal $admin_exists t] } {
return 1
Index: openacs-4/packages/cms/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/widget-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/widget-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/tcl/widget-procs.tcl 27 May 2001 04:39:19 -0000 1.2
@@ -222,7 +222,7 @@
# @param content_type The content type to which the attribute belongs
# @param attribute_name The name of the attribute
-proc widget::process_param { db form order content_type attribute_name } {
+proc widget::process_param { form order content_type attribute_name } {
template::form get_values $form \
param_$order param_type_$order \
param_source_$order param_value_$order
Index: openacs-4/packages/cms/tcl/workflow-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/workflow-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/workflow-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/tcl/workflow-procs.tcl 27 May 2001 04:39:19 -0000 1.2
@@ -14,7 +14,7 @@
# @param case_id The publishing workflow
# @param user_id The From: user when sending the email
-proc workflow::notify_of_assignments { db case_id user_id } {
+proc workflow::notify_of_assignments { case_id user_id } {
template::query assignments multilist "
select
@@ -43,7 +43,7 @@
c.state = 'active'
and
c.object_id = i.item_id
- " -db $db
+ "
foreach assignment $assignments {
@@ -168,13 +168,13 @@
# @param db A database handle
# @param task_id The task
-proc workflow::notify_admin_of_finished_task { db task_id } {
+proc workflow::notify_admin_of_finished_task { task_id } {
# the user who finished the task
set user_id [User::getID]
template::query name onevalue "
select person.name( :user_id ) from dual
- " -db $db
+ "
# get the task name, the creation_user, title, and date of the item
template::query task_info onerow "
@@ -199,7 +199,7 @@
i.item_id = o.object_id
and
t.task_id = :task_id
- " -db $db
+ "
template::util::array_to_vars task_info
Index: openacs-4/packages/cms/www/register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/Attic/register.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/register.tcl 27 May 2001 00:22:34 -0000 1.4
+++ openacs-4/packages/cms/www/register.tcl 27 May 2001 04:39:19 -0000 1.5
@@ -50,13 +50,13 @@
"" "" "" "" "" $user_id]
db_dml update_users "
- update users
+ update users
set screen_name = :screen_name
where user_id = :user_id"
# if there are no users with the 'cm_admin' privilege
# (the CMS has never been used), then this user will be the admin
- set cms_admin_exists [User::cms_admin_exists $db]
+ set cms_admin_exists [User::cms_admin_exists]
if { $cms_admin_exists == 0 } {
set is_admin t
} else {
@@ -98,7 +98,7 @@
"
}
- User::login $db $user_id
+ User::login $user_id
}
template::forward index
Index: openacs-4/packages/cms/www/signin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/Attic/signin.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/signin.tcl 27 May 2001 00:22:34 -0000 1.2
+++ openacs-4/packages/cms/www/signin.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -41,7 +41,7 @@
} else {
- User::login $db $info(user_id)
+ User::login $info(user_id)
template::forward index
return
}
Index: openacs-4/packages/cms/www/modules/items/content-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-add-1.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/content-add-1.tcl 24 May 2001 01:30:52 -0000 1.2
+++ openacs-4/packages/cms/www/modules/items/content-add-1.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -19,7 +19,7 @@
template::util::array_to_vars one_revision
# permissions check - must have cm_write on the item
-content::check_access $item_id cm_write -user_id [User::getID] -db $db
+content::check_access $item_id cm_write -user_id [User::getID]
# check for custom content-add-1 form
Index: openacs-4/packages/cms/www/modules/items/relate-items-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/relate-items-2.tcl 26 May 2001 19:45:03 -0000 1.4
+++ openacs-4/packages/cms/www/modules/items/relate-items-2.tcl 27 May 2001 04:39:19 -0000 1.5
@@ -156,7 +156,7 @@
if { [llength $elements] > 0 } {
set attr_list [template::util::tcl_to_sql_list $elements]
ns_log notice "$i : $attr_list"
- content::insert_element_data $db rel_form_2 $relation_type \
+ content::insert_element_data rel_form_2 $relation_type \
[list acs_object cr_item_rel] $rel_id "_$i" \
" attribute_name in ($attr_list)"
}
Index: openacs-4/packages/cms/www/modules/items/revision-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-add-1.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/revision-add-1.tcl 24 May 2001 01:30:52 -0000 1.2
+++ openacs-4/packages/cms/www/modules/items/revision-add-1.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -6,7 +6,7 @@
request set_param item_id -datatype integer
# check permissions
-content::check_access $item_id cm_write -user_id [User::getID] -db $db
+content::check_access $item_id cm_write -user_id [User::getID]
template::query get_content_type content_type onevalue "
select
Index: openacs-4/packages/cms/www/modules/items/revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revisions.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/revisions.tcl 24 May 2001 01:30:52 -0000 1.2
+++ openacs-4/packages/cms/www/modules/items/revisions.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -52,6 +52,6 @@
order by
revision_number desc" $page]
-set total_pages [pagination::get_total_pages $db]
+set total_pages [pagination::get_total_pages]
set pagination_html [pagination::page_number_links $page $total_pages]
Index: openacs-4/packages/cms/www/modules/items/status-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/status-edit.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/status-edit.tcl 27 May 2001 00:22:34 -0000 1.4
+++ openacs-4/packages/cms/www/modules/items/status-edit.tcl 27 May 2001 04:39:19 -0000 1.5
@@ -114,7 +114,7 @@
form get_values publish_status publish_status start_when end_when item_id
db_transaction {
- publish::set_publish_status $db $item_id $publish_status
+ publish::set_publish_status $item_id $publish_status
set start_when [template::util::date get_property sql_date $start_when]
set end_when [template::util::date get_property sql_date $end_when]
Index: openacs-4/packages/cms/www/modules/items/unrelate-item.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/unrelate-item.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/unrelate-item.tcl 27 May 2001 00:22:34 -0000 1.3
+++ openacs-4/packages/cms/www/modules/items/unrelate-item.tcl 27 May 2001 04:39:19 -0000 1.4
@@ -20,8 +20,7 @@
# Check permissions
content::check_access $item_id cm_relate \
-mount_point $mount_point \
- -return_url "modules/sitemap/index" \
- -db $db
+ -return_url "modules/sitemap/index"
lappend passthrough [list item_id $item_id]
Index: openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl 27 May 2001 00:22:34 -0000 1.3
+++ openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl 27 May 2001 04:39:19 -0000 1.4
@@ -8,10 +8,8 @@
request set_param content_method -datatype keyword
-set db [ns_db gethandle]
-
# permissions check - need cm_new on parent_id to create new captioned image
-content::check_access $parent_id cm_new -user_id [User::getID] -db $db
+content::check_access $parent_id cm_new -user_id [User::getID]
@@ -23,8 +21,6 @@
name -datatype keyword -widget hidden
}
-ns_db releasehandle $db
-
content::add_attribute_element captioned_image content_revision title
content::add_attribute_element captioned_image content_revision description
Index: openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl 27 May 2001 00:22:34 -0000 1.4
+++ openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl 27 May 2001 04:39:19 -0000 1.5
@@ -5,7 +5,7 @@
request set_param item_id -datatype integer
# permissions check - need cm_write on item_id to add a revision
-content::check_access $item_id cm_write -user_id [User::getID] -db $db
+content::check_access $item_id cm_write -user_id [User::getID]
form create image -html { enctype "multipart/form-data" } -elements {
item_id -datatype integer -widget hidden -param
Index: openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -4,19 +4,18 @@
request set_param revision_id -datatype integer
-set db [ns_db gethandle]
-query item_id onevalue "
+template::query get_item_id item_id onevalue "
select
item_id
from
cr_revisions
where
revision_id = :revision_id
-" -db $db
+"
# permissions check - need cm_new on parent_id to create new image
-content::check_access $item_id cm_write -user_id [User::getID] -db $db
+content::check_access $item_id cm_write -user_id [User::getID]
@@ -32,7 +31,6 @@
-widget file \
-label "Upload Image"
-ns_db releasehandle $db
Index: openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.xql 25 May 2001 04:56:37 -0000 1.1
+++ openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.xql 27 May 2001 04:39:19 -0000 1.2
@@ -11,5 +11,18 @@
+
+
+
+
+ select
+ item_id
+ from
+ cr_revisions
+ where
+ revision_id = :revision_id
+
+
+
Index: openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl 27 May 2001 00:22:34 -0000 1.3
+++ openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl 27 May 2001 04:39:19 -0000 1.4
@@ -5,10 +5,8 @@
request set_param content_type -datatype keyword
-set db [ns_db gethandle]
-
# permissions check - need cm_new on parent_id to create new image
-content::check_access $parent_id cm_new -user_id [User::getID] -db $db
+content::check_access $parent_id cm_new -user_id [User::getID]
@@ -19,7 +17,6 @@
name -datatype keyword -widget hidden
}
-ns_db releasehandle $db
content::add_attribute_element image content_revision title
content::add_attribute_element image content_revision description
Index: openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -4,10 +4,9 @@
request create
request set_param item_id -datatype integer
-set db [ns_db gethandle]
# permissions check - need cm_write on item_id to add a revision
-content::check_access $item_id cm_write -user_id [User::getID] -db $db
+content::check_access $item_id cm_write -user_id [User::getID]
@@ -16,7 +15,7 @@
item_id -datatype integer -widget hidden -param
}
-query item_info onerow "
+template::query get_item_info item_info onerow "
select
i.name, i.latest_revision, r.title
from
@@ -27,11 +26,10 @@
i.item_id = r.item_id
and
i.latest_revision = r.revision_id
-" -db $db
+"
template::util::array_to_vars item_info
-ns_db releasehandle $db
content::add_attribute_elements image image $latest_revision
@@ -46,18 +44,8 @@
-widget file \
-label "Upload Image"
-# a noop ?
-# if { [form is_request image] } {
-
-# set db [template::get_db_handle]
-# ns_db releasehandle $db
-# }
-
-
-
-
if { [form is_valid image] } {
form get_values image item_id title description upload
Index: openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.xql 25 May 2001 04:56:37 -0000 1.1
+++ openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.xql 27 May 2001 04:39:19 -0000 1.2
@@ -12,5 +12,23 @@
+
+
+
+
+ select
+ i.name, i.latest_revision, r.title
+ from
+ cr_items i, cr_revisions r
+ where
+ i.item_id = :item_id
+ and
+ i.item_id = r.item_id
+ and
+ i.latest_revision = r.revision_id
+
+
+
+
Index: openacs-4/packages/cms/www/modules/sitemap/attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/attributes.tcl 26 May 2001 19:45:03 -0000 1.3
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.tcl 27 May 2001 04:39:19 -0000 1.4
@@ -11,7 +11,7 @@
# permissions check - user must have cm_examine on this folder
-content::check_access $folder_id cm_examine -user_id [User::getID] -db $db
+content::check_access $folder_id cm_examine -user_id [User::getID]
# Get the registered types for the folder
@@ -97,7 +97,7 @@
# permissions check - must have cm_write on folder to modify its options
content::check_access $folder_resolved_id cm_write \
- -user_id [User::getID] -db $db
+ -user_id [User::getID]
if { [string equal $allow_subfolders "t"] } {
Index: openacs-4/packages/cms/www/modules/types/widget-register-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-1.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/widget-register-1.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/types/widget-register-1.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -13,16 +13,14 @@
}
-set db [ns_db gethandle]
-query form_widgets multilist "
+template::query get_form_widgets form_widgets multilist "
select
widget, widget
from
cm_form_widgets
-" -db $db
+"
-ns_db releasehandle $db
element create widget_register widget \
-datatype keyword \
@@ -43,9 +41,8 @@
if { [form is_request widget_register] } {
- set db [ns_db gethandle]
- query attribute_info onerow "
+ template::query get_attr_info attribute_info onerow "
select
a.pretty_name as attribute_name_pretty,
t.pretty_name as content_type_pretty,
@@ -57,18 +54,17 @@
a.object_type = t.object_type
and
a.attribute_id = :attribute_id
- " -db $db
+ "
- query register_widget onerow "
+ template::query get_reg_widget register_widget onerow "
select
widget as registered_widget, is_required
from
cm_attribute_widgets
where
attribute_id = :attribute_id
- " -db $db
+ "
- ns_db releasehandle $db
template::util::array_to_vars attribute_info
element set_properties widget_register content_type_pretty \
Index: openacs-4/packages/cms/www/modules/types/widget-register-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/widget-register-2.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/types/widget-register-2.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -100,7 +100,7 @@
db_transaction {
for { set i 0 } { $i < $param_count } { incr i } {
- widget::process_param $db \
+ widget::process_param \
widget_register $i $content_type $attribute_name
}
}
Index: openacs-4/packages/cms/www/modules/types/widget-register.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register.xql 27 May 2001 04:39:19 -0000 1.2
@@ -14,5 +14,48 @@
+
+
+
+ select
+ widget, widget
+ from
+ cm_form_widgets
+
+
+
+
+
+
+
+
+ select
+ a.pretty_name as attribute_name_pretty,
+ t.pretty_name as content_type_pretty,
+ t.object_type as content_type,
+ a.attribute_name
+ from
+ acs_attributes a, acs_object_types t
+ where
+ a.object_type = t.object_type
+ and
+ a.attribute_id = :attribute_id
+
+
+
+
+
+
+
+ select
+ widget as registered_widget, is_required
+ from
+ cm_attribute_widgets
+ where
+ attribute_id = :attribute_id
+
+
+
+
Index: openacs-4/packages/cms/www/modules/users/make-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/make-admin.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/users/make-admin.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/users/make-admin.tcl 27 May 2001 04:39:19 -0000 1.3
@@ -13,7 +13,7 @@
db_transaction {
content::check_access [cm::modules::sitemap::getRootFolderID] "cm_admin" \
- -mount_point $mount_point -parent_id $parent_id -db $db
+ -mount_point $mount_point -parent_id $parent_id
# Grant cm_admin on sitemap, templates, users
Index: openacs-4/packages/cms/www/modules/workflow/case-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/case-create.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/workflow/case-create.tcl 27 May 2001 00:22:34 -0000 1.4
+++ openacs-4/packages/cms/www/modules/workflow/case-create.tcl 27 May 2001 04:39:19 -0000 1.5
@@ -18,7 +18,6 @@
content::check_access $item_id cm_item_workflow \
-mount_point workflow \
-return_url "../items/index?item_id=$item_id" \
- -db $db \
-request_error
# get a list of users (this should be context-specific)
@@ -265,7 +264,7 @@
"
# email notifications of task assignments
- workflow::notify_of_assignments $db $case_id $user_id
+ workflow::notify_of_assignments $case_id $user_id
}
Index: openacs-4/packages/cms/www/modules/workflow/task-finish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/task-finish.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/workflow/task-finish.tcl 27 May 2001 00:22:34 -0000 1.4
+++ openacs-4/packages/cms/www/modules/workflow/task-finish.tcl 27 May 2001 04:39:19 -0000 1.5
@@ -108,7 +108,7 @@
end;"
# send email notification to the creator of the item
- workflow::notify_admin_of_finished_task $db $task_id
+ workflow::notify_admin_of_finished_task $task_id
}