-
+
Folder Options |
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.4 -r1.5
--- openacs-4/packages/cms/www/modules/sitemap/attributes.tcl 27 May 2001 04:39:19 -0000 1.4
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.tcl 8 Jun 2001 01:44:53 -0000 1.5
@@ -114,8 +114,8 @@
db_exec_plsql content "
begin
- content_folder.${subfolder_method}(:folder_resolved_id,'content_folder');
- content_folder.${symlink_method}(:folder_resolved_id,'content_symlink');
+ content_folder.${subfolder_method}(:folder_resolved_id,'content_folder','f');
+ content_folder.${symlink_method}(:folder_resolved_id,'content_symlink','f');
end;"
}
Index: openacs-4/packages/cms/www/modules/sitemap/copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/copy.adp 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/sitemap/copy.adp 8 Jun 2001 01:44:53 -0000 1.2
@@ -1,13 +1,14 @@
-Copy Items to @path@
-Copy Items to @path@
-
- No items are currently available for linking. Please mark
+Copy Items
+ Copy Items to:
+ No items are currently available for copying. Please mark
your choices and return to this form.
+Copy Items to @path@
+Copy Items to @path@
@@ -61,4 +62,4 @@
-
\ No newline at end of file
+
Index: openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql 26 May 2001 18:40:15 -0000 1.2
+++ openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql 8 Jun 2001 01:44:53 -0000 1.3
@@ -36,7 +36,7 @@
-
+
select
@@ -78,7 +78,7 @@
is_index_page desc $orderby_clause
-
+
Index: openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql 26 May 2001 18:40:15 -0000 1.2
+++ openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.3
@@ -38,7 +38,7 @@
-
+
select
@@ -47,7 +47,7 @@
r.item_id, r.resolved_id, r.is_symlink, r.name,
coalesce(trim(
case when o.object_type = 'content_symlink' then r.label
- when o.object_type = 'content_folder' then f.label,
+ when o.object_type = 'content_folder' then f.label
else coalesce(v.title, i.name) end),'-') as title,
case when i.publish_status = 'live' then to_char(u.publish_date, 'MM/DD/YYYY') else '-' end as publish_date,
o.object_type, t.pretty_name as content_type,
@@ -78,7 +78,7 @@
is_index_page desc $orderby_clause
-
+
@@ -102,7 +102,7 @@
select
- i.item_id id,
+ i.item_id as id,
content_item__get_path(i.item_id, null) as path
from
cr_items i, cr_symlinks s
@@ -118,7 +118,7 @@
select
- parent_id, coalesce(label, name) label, description
+ parent_id, coalesce(label, name) as label, description
from
cr_items i, cr_folders f
where
Index: openacs-4/packages/cms/www/modules/sitemap/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/index.tcl 26 May 2001 18:40:15 -0000 1.3
+++ openacs-4/packages/cms/www/modules/sitemap/index.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -171,10 +171,10 @@
set orderby_clause ", o.object_type, last_modified desc"
}
object_type {
- set orderby_clause ", o.object_type, content_type, upper(title)"
+ set orderby_clause ", o.object_type, content_type, upper(v.title)"
}
default {
- set orderby_clause ", o.object_type, upper(title)"
+ set orderby_clause ", o.object_type, upper(v.title)"
}
}
Index: openacs-4/packages/cms/www/modules/sitemap/move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/move.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/move.adp 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/sitemap/move.adp 8 Jun 2001 01:44:53 -0000 1.2
@@ -1,13 +1,15 @@
-Move Items to @path@
-Move Items to @path@
- No items are currently available for linking. Please mark
+Move Items to:
+ Move Items to:
+ No items are currently available for moving. Please mark
your choices and return to this form.
+Move Items to @path@
+Move Items to @path@
@@ -17,12 +19,12 @@
-
+
-
+
|
Name |
@@ -61,4 +63,4 @@
-
\ No newline at end of file
+
Index: openacs-4/packages/cms/www/modules/sitemap/move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/move.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/move.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/sitemap/move.tcl 8 Jun 2001 01:44:53 -0000 1.3
@@ -12,6 +12,7 @@
set folder_id $id
}
+
# permission check - must have cm_write on the current folder
set user_id [User::getID]
content::check_access $folder_id cm_new -user_id $user_id
@@ -33,6 +34,8 @@
dual
"
+ns_log Notice "path = $path"
+
# get relevant marked items
template::query get_marked marked_items multirow "
select
Index: openacs-4/packages/cms/www/modules/templates/clipboard-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/clipboard-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/clipboard-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,20 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select
+ template_id, content_item.get_path(template_id) path
+ from
+ cr_templates
+ where
+ template_id in ($in_list)
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/clipboard-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/clipboard-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/clipboard-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,19 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select
+ template_id, content_item__get_path(template_id,null) as path
+ from
+ cr_templates
+ where
+ template_id in ($in_list)
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/clipboard.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/clipboard.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/clipboard.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/clipboard.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -8,14 +8,12 @@
if { $template_count > 0 } {
- set query "select
+ template::query get_templates templates multirow "select
template_id, content_item.get_path(template_id) path
from
cr_templates
where
template_id in ($in_list)"
-
- query templates multirow $query
}
-set return_url [ns_set iget [ns_conn headers] Referer]
\ No newline at end of file
+set return_url [ns_set iget [ns_conn headers] Referer]
Index: openacs-4/packages/cms/www/modules/templates/edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/edit-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/edit-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,14 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select content_item.get_path(:template_id) from dual
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/edit-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/edit-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,14 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select content_item__get_path(:template_id, null)
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/edit.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/edit.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/edit.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -5,7 +5,7 @@
if { ! [request is_valid] } { return }
-query path onevalue "
+template::query get_path path onevalue "
select content_item.get_path(:template_id) from dual"
form create edit_template -html { enctype multipart/form-data }
@@ -20,7 +20,7 @@
element create edit_template content -widget textarea -label {} \
-datatype text -html { cols 80 rows 30 } template
-query mime_types multilist "
+template::query get_mime_types mime_types multilist "
select label, m.mime_type from cr_mime_types m, cr_content_mime_type_map t
where t.content_type = 'content_template' and t.mime_type = m.mime_type"
@@ -54,7 +54,7 @@
element set_value edit_template content \
[content::get_content_value $edit_revision]
- query mime_type onevalue "
+ template::query get_mime_type mime_type onevalue "
select mime_type from cr_revisions where revision_id = :edit_revision"
element set_value edit_template mime_type $mime_type
@@ -88,7 +88,7 @@
set tmpfile [content::prepare_content_file edit_template]
- query revision_count onevalue "
+ template::query get_revision_count revision_count onevalue "
select count(revision_id) from cr_revisions where item_id = :template_id"
if { $revision_count == 0 } {
Index: openacs-4/packages/cms/www/modules/templates/edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/edit.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/edit.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+ select label, m.mime_type from cr_mime_types m, cr_content_mime_type_map t
+ where t.content_type = 'content_template' and t.mime_type = m.mime_type
+
+
+
+
+
+
+
+ select mime_type from cr_revisions where revision_id = :edit_revision
+
+
+
+
+
+
+
+ select count(revision_id)
+ from cr_revisions
+ where item_id = :template_id
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/index-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,58 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+
+ select
+ content_item.get_id(:path, content_template.get_root_folder)
+ from dual
+
+
+
+
+
+
+
+
+ select content_template.get_root_folder from dual
+
+
+
+
+
+
+
+ select content_item.get_path(:id) from dual
+
+
+
+
+
+
+
+ select
+ t.template_id, i.name,
+ to_char(o.last_modified, 'MM/DD/YY HH:MI AM') modified,
+ nvl(round(r.content_length / 1000), 0) || ' KB' as file_size
+ from
+ cr_templates t, cr_items i, acs_objects o, cr_revisions r
+ where
+ i.parent_id = :id
+ and
+ i.item_id = t.template_id
+ and
+ i.item_id = o.object_id
+ and
+ i.latest_revision = r.revision_id (+)
+ order by
+ upper(i.name)
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/index-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,57 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select
+ content_item__get_id(:path, content_template__get_root_folder(), 'f')
+
+
+
+
+
+
+
+
+ select content_template__get_root_folder()
+
+
+
+
+
+
+
+ select content_item__get_path(:id, null)
+
+
+
+
+
+
+
+ select
+ t.template_id, i.name,
+ to_char(o.last_modified, 'MM/DD/YY HH:MI AM') as modified,
+ coalesce(round(r.content_length::float8 / 1000), 0) || ' KB' as file_size
+ from
+ cr_templates t, acs_objects o,
+ cr_revisions r
+ RIGHT OUTER JOIN
+ cr_items i ON i.latest_revision = r.revision_id
+ where
+ i.parent_id = :id
+ and
+ i.item_id = t.template_id
+ and
+ i.item_id = o.object_id
+ order by
+ upper(i.name)
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/index.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/index.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -19,7 +19,7 @@
if { ! [string equal $path {}] } {
- query id onevalue "
+ template::query get_id id onevalue "
select
content_item.get_id(:path, content_template.get_root_folder)
from dual"
@@ -32,17 +32,17 @@
} else {
if { [string equal $id {}] } {
- query id onevalue "
+ template::query get_root_folder_id id onevalue "
select content_template.get_root_folder from dual"
}
- query path onevalue "
+ template::query get_path path onevalue "
select content_item.get_path(:id) from dual"
}
# query for the content type and redirect if a folder
-query type onevalue "
+template::query get_type type onevalue "
select content_type from cr_items where item_id = :id"
if { [string equal $type content_template] } {
@@ -52,7 +52,7 @@
# Query for the parent
if { ! [string equal $path /] } {
-query parent onerow "
+template::query get_parent parent onerow "
select
f.folder_id, f.label, i.name,
to_char(o.last_modified, 'MM/DD/YY HH:MI AM') modified
@@ -68,7 +68,7 @@
# Query folders first
-query folders multirow "
+template::query get_folders folders multirow "
select
f.folder_id, f.label, i.name,
to_char(o.last_modified, 'MM/DD/YY HH:MI AM') modified
@@ -85,7 +85,7 @@
# items in the folder
-query items multirow "
+template::query get_items items multirow "
select
t.template_id, i.name,
to_char(o.last_modified, 'MM/DD/YY HH:MI AM') modified,
@@ -105,4 +105,4 @@
# set a flag indicating whether the folder is empty
-set is_empty [expr ! ( ${items:rowcount} || ${folders:rowcount} )]
\ No newline at end of file
+set is_empty [expr ! ( ${items:rowcount} || ${folders:rowcount} )]
Index: openacs-4/packages/cms/www/modules/templates/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/index.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+ select content_type from cr_items where item_id = :id
+
+
+
+
+
+
+
+ select
+ f.folder_id, f.label, i.name,
+ to_char(o.last_modified, 'MM/DD/YY HH:MI AM') as modified
+ from
+ cr_folders f, cr_items i, acs_objects o
+ where
+ i.item_id = (select parent_id from cr_items where item_id = :id)
+ and
+ i.item_id = f.folder_id
+ and
+ i.item_id = o.object_id
+
+
+
+
+
+
+
+ select
+ f.folder_id, f.label, i.name,
+ to_char(o.last_modified, 'MM/DD/YY HH:MI AM') as modified
+ from
+ cr_folders f, cr_items i, acs_objects o
+ where
+ i.parent_id = :id
+ and
+ i.item_id = f.folder_id
+ and
+ i.item_id = o.object_id
+ order by
+ upper(f.label), upper(i.name)
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/new-folder-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-folder-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/new-folder-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,30 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select content_item.get_path(:parent_id) from dual
+
+
+
+
+
+
+
+
+ begin :1 := content_folder.new(
+ folder_id => :folder_id,
+ name => :name,
+ label => :label,
+ description => :description,
+ parent_id => :parent_id,
+ creation_ip => :creation_ip,
+ creation_user => :creation_user
+ ); end;
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/new-folder-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-folder-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/new-folder-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,31 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select content_item__get_path(:parent_id, null)
+
+
+
+
+
+
+
+ select content_folder__new(
+ :name,
+ :label,
+ :description,
+ :parent_id,
+ null,
+ :folder_id,
+ now(),
+ :creation_user,
+ :creation_ip
+ )
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/new-folder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-folder.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/templates/new-folder.tcl 26 May 2001 19:45:03 -0000 1.3
+++ openacs-4/packages/cms/www/modules/templates/new-folder.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -2,7 +2,7 @@
parent_id -datatype integer
}
-query path onevalue "
+template::query get_path path onevalue "
select content_item.get_path(:parent_id) from dual"
form create new_folder -elements "
@@ -41,7 +41,7 @@
db_transaction {
- set folder_id [db_exec_plsql "begin :1 := content_folder.new(
+ set folder_id [db_exec_plsql new_folder "begin :1 := content_folder.new(
folder_id => :folder_id,
name => :name,
label => :label,
Index: openacs-4/packages/cms/www/modules/templates/new-template-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-template-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/new-template-oracle.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/new-template-oracle.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -16,4 +16,13 @@
+
+
+
+ select content_item.get_path(:folder_id) from dual
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/new-template-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-template-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/new-template-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/new-template-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -14,8 +14,16 @@
:creation_user,
:creation_ip
);
+
+
+
+
+ select content_item__get_path(:folder_id, null)
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/new-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-template.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/templates/new-template.tcl 27 May 2001 00:22:34 -0000 1.3
+++ openacs-4/packages/cms/www/modules/templates/new-template.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -4,7 +4,7 @@
ns_log Notice "folder_id is $folder_id"
-query path onevalue "
+template::query get_path path onevalue "
select content_item.get_path(:folder_id) from dual"
form create new_template -elements "
@@ -14,7 +14,7 @@
name -datatype filename -html { size 40 }
"
-query mime_types multilist "
+template::query get_mime_types mime_types multilist "
select label, m.mime_type from cr_mime_types m, cr_content_mime_type_map t
where t.content_type = 'content_template' and t.mime_type = m.mime_type"
Index: openacs-4/packages/cms/www/modules/templates/new-template.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-template.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/new-template.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+ select label, m.mime_type from cr_mime_types m, cr_content_mime_type_map t
+ where t.content_type = 'content_template' and t.mime_type = m.mime_type
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/properties-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/properties-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/properties-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,33 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select
+ content_item.get_id(:path, content_template.get_root_folder)
+ from dual
+
+
+
+
+
+
+
+ select content_template.get_root_folder from dual
+
+
+
+
+
+
+
+ select content_item.get_path(:id) from dual
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/properties-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/properties-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/properties-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,32 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select
+ content_item__get_id(:path, content_template__get_root_folder(), 'f')
+
+
+
+
+
+
+
+ select content_template__get_root_folder()
+
+
+
+
+
+
+
+ select content_item__get_path(:id, null)
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/properties.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/properties.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/properties.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/properties.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -6,7 +6,7 @@
if { ! [string equal $path {}] } {
- query id onevalue "
+ template::query get_id id onevalue "
select
content_item.get_id(:path, content_template.get_root_folder)
from dual"
@@ -20,17 +20,17 @@
} else {
if { [string equal $id {}] } {
- query id onevalue "
+ template::query get_root_id onevalue "
select content_template.get_root_folder from dual"
}
- query path onevalue "
+ template::query get_path path onevalue "
select content_item.get_path(:id) from dual"
}
# query for the content type and redirect if a folder
-query type onevalue "
+template::query get_type type onevalue "
select content_type from cr_items where item_id = :id"
if { [string equal $type content_folder] } {
@@ -45,4 +45,4 @@
multirow append tabs {Content Types} types
multirow append tabs {Content Items} items
-set tab_count [expr ${tabs:rowcount} * 2]
\ No newline at end of file
+set tab_count [expr ${tabs:rowcount} * 2]
Index: openacs-4/packages/cms/www/modules/templates/properties.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/properties.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/properties.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ select content_type from cr_items where item_id = :id
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/revisions-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/revisions-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/revisions-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,34 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select
+ revision_id,
+ to_char(o.creation_date, 'MM/DD/YY HH:MI AM') modified,
+ round(dbms_lob.getlength(r.content) / 1000) || ' KB' as file_size,
+ decode(NVL(p.person_id, 0),
+ 0, '-',
+ substr(p.first_names, 1, 1) || substr(p.last_name, 1, 1)) modified_by,
+ nvl(j.msg, '-') msg
+ from
+ cr_revisions r, acs_objects o, persons p, journal_entries j
+ where
+ item_id = :template_id
+ and
+ o.object_id = r.revision_id
+ and
+ o.creation_user = p.person_id (+)
+ and
+ o.object_id = j.journal_id (+)
+ order by
+ o.creation_date desc
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/revisions-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/revisions-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/revisions-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,35 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select
+ revision_id,
+ to_char(o.creation_date, 'MM/DD/YY HH:MI AM') as modified,
+ (round(r.content_length::float8 / 1000.0) || ' KB') as file_size,
+ case when coalesce(p.person_id, 0) = 0
+ then '-'
+ else substr(p.first_names, 1, 1) || substr(p.last_name, 1, 1) end as modified_by,
+ coalesce(j.msg, '-') as msg
+ from
+ cr_revisions r,
+ acs_objects o
+ LEFT OUTER JOIN
+ journal_entries j ON o.object_id = j.journal_id
+ LEFT OUTER JOIN
+ persons p ON o.creation_user = p.person_id
+ where
+ item_id = :template_id
+ and
+ o.object_id = r.revision_id
+ order by
+ o.creation_date desc
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/revisions.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/revisions.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/revisions.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -1,23 +1,21 @@
# template ID is passed to included template
-query live_revision onevalue "
+template::query get_live_revision live_revision onevalue "
select live_revision from cr_items where item_id = :template_id"
# first count all revisions
-set query "
+template::query get_revision_count revision_count onevalue "
select
count(*)
from
cr_revisions
where
item_id = :template_id"
-query revision_count onevalue $query
-
set counter $revision_count
-set query "
+template::query get_revisions revisions multirow "
select
revision_id,
to_char(o.creation_date, 'MM/DD/YY HH:MI AM') modified,
@@ -37,10 +35,7 @@
and
o.object_id = j.journal_id (+)
order by
- o.creation_date desc"
-
-
-query revisions multirow $query -maxrows 12 -eval {
+ o.creation_date desc" -maxrows 12 -eval {
set row(revision_number) $counter
incr counter -1
-}
\ No newline at end of file
+}
Index: openacs-4/packages/cms/www/modules/templates/revisions.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/revisions.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/revisions.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+ select live_revision from cr_items where item_id = :template_id
+
+
+
+
+
+
+
+
+ select
+ count(*)
+ from
+ cr_revisions
+ where
+ item_id = :template_id
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/template-create-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-create-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/template-create-oracle.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/template-create-oracle.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -17,5 +17,13 @@
+
+
+
+ select acs_object_id_seq.nextval from dual
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/template-create-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-create-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/template-create-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/template-create-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -18,5 +18,12 @@
+
+
+
+ select acs_object_id_seq.nextval
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/template-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-create.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/templates/template-create.tcl 26 May 2001 19:45:03 -0000 1.3
+++ openacs-4/packages/cms/www/modules/templates/template-create.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -9,7 +9,7 @@
set parent_id [cm::modules::templates::getRootFolderID]
}
-query folder_name onevalue "
+template::query get_folder_name folder_name onevalue "
select name from cr_items where item_id = :parent_id"
if { [util::is_nil folder_name] } {
@@ -32,7 +32,7 @@
if { [form is_request create_template] } {
# to avoid dupe submits
- query template_id onevalue "select acs_object_id_seq.nextval from dual"
+ template::query get_template_id template_id onevalue "select acs_object_id_seq.nextval from dual"
element set_properties create_template template_id -value $template_id
}
Index: openacs-4/packages/cms/www/modules/templates/template-create.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-create.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/template-create.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ select name from cr_items where item_id = :parent_id
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -12,5 +12,25 @@
+
+
+
+
+ select 't' from dual
+ where not exists (
+ select
+ 1
+ from
+ cr_templates t, acs_objects o
+ where
+ o.object_id = t.template_id
+ and
+ o.context_id = :template_id
+ and not exists (select 1 from cr_revisions
+ where revision_id = t.template_id))
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/template-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-delete-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/template-delete-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/template-delete-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -11,5 +11,23 @@
+
+
+
+ select 't'::text from dual
+ where not exists (
+ select
+ 1
+ from
+ cr_templates t, acs_objects o
+ where
+ o.object_id = t.template_id
+ and
+ o.context_id = :template_id
+ and not exists (select 1 from cr_revisions
+ where revision_id = t.template_id))
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/template-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-delete.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/template-delete.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/templates/template-delete.tcl 8 Jun 2001 01:44:53 -0000 1.3
@@ -8,7 +8,7 @@
# Determine if the item has subitems is empty
-query empty_p onevalue "
+template::query get_status empty_p onevalue "
select 't' from dual
where not exists (
select
Index: openacs-4/packages/cms/www/modules/templates/upload-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/upload-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/upload-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,15 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select content_item.get_path(:template_id) from dual
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/upload-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/upload-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/upload-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,15 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select content_item__get_path(:template_id, null)
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/templates/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/upload.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/upload.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/templates/upload.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -4,7 +4,7 @@
if { ! [request is_valid] } { return }
-query path onevalue "
+template::query get_path path onevalue "
select content_item.get_path(:template_id) from dual"
form create edit_template -html { enctype multipart/form-data }
Index: openacs-4/packages/cms/www/modules/types/content-method.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content-method.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/types/content-method.tcl 26 May 2001 18:40:15 -0000 1.3
+++ openacs-4/packages/cms/www/modules/types/content-method.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -101,7 +101,7 @@
db_transaction {
- template::query add_method content_method_add dml "
+ db_exec_plsql add_method "
begin
content_method.add_method (
content_type => :content_type,
Index: openacs-4/packages/cms/www/modules/types/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/index-postgresql.xql 30 May 2001 22:56:27 -0000 1.2
+++ openacs-4/packages/cms/www/modules/types/index-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.3
@@ -9,7 +9,7 @@
select
case when ot2.supertype = 'acs_object' then '' else ot2.supertype end as parent_type,
case when ot2.object_type = 'content_revision' then '' else ot2.object_type end as object_type,
- pretty_name
+ ot2.pretty_name
from
(select * from acs_object_types where object_type = :content_type) ot1,
acs_object_types ot2
@@ -36,7 +36,7 @@
description, widget
from
acs_attributes attr left outer join cm_attribute_widgets w using (attribute_id)
- left outer join acs_attribute_descriptions d using (attribute_name)
+ left outer join acs_attribute_descriptions d using (attribute_name),
( select
o2.object_type, o2.pretty_name
from
Index: openacs-4/packages/cms/www/modules/types/register-templates-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/register-templates-oracle.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/register-templates-oracle.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -14,5 +14,30 @@
+
+
+
+ select
+ template_id,
+ content_item.get_path( template_id, content_template.get_root_folder )
+ as name
+ from
+ cr_templates t, cr_items i
+ where
+ t.template_id = i.item_id
+ and not exists (
+ select 1
+ from
+ cr_type_template_map
+ where
+ template_id = t.template_id
+ and
+ content_type = :content_type )
+ and
+ $marked_templates_sql
+
+
+
+
Index: openacs-4/packages/cms/www/modules/types/register-templates-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/register-templates-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/register-templates-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -15,5 +15,30 @@
+
+
+
+
+ select
+ template_id,
+ content_item__get_path( template_id, content_template__get_root_folder() )
+ as name
+ from
+ cr_templates t, cr_items i
+ where
+ t.template_id = i.item_id
+ and not exists (
+ select 1
+ from
+ cr_type_template_map
+ where
+ template_id = t.template_id
+ and
+ content_type = :content_type )
+ and
+ $marked_templates_sql
+
+
+
Index: openacs-4/packages/cms/www/modules/types/register-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/register-templates.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/types/register-templates.tcl 8 Jun 2001 01:44:53 -0000 1.3
@@ -6,7 +6,7 @@
# get the content type pretty name
-query object_type_pretty onevalue "
+template::query get_pretty_type object_type_pretty onevalue "
select
pretty_name
from
@@ -47,7 +47,7 @@
# make sure we only get content templates (not folders, symlinks,
# etc.) that aren't already registered to this content type
-query only_marked_templates multilist "
+template::query get_content_templates only_marked_templates multilist "
select
template_id,
content_item.get_path( template_id, content_template.get_root_folder )
@@ -79,7 +79,7 @@
if { $template_count > 0 } {
# for the context pick list(s)
- query cr_use_contexts multilist "
+ template::query get_use_contexts cr_use_contexts multilist "
select use_context, use_context
from cr_template_use_contexts
order by 1"
Index: openacs-4/packages/cms/www/modules/types/register-templates.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/types/register-templates.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+ select
+ pretty_name
+ from
+ acs_object_types
+ where
+ object_type = :content_type
+
+
+
+
+
+
+
+
+ select use_context, use_context
+ from cr_template_use_contexts
+ order by 1
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/types/widget-register-1-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-1-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register-1-oracle.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register-1-oracle.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -18,4 +18,14 @@
+
+
+
+ update cm_attribute_widgets
+ set is_required = case when is_required = 't' then 'f' else 't' end
+ where attribute_id = :attribute_id
+ and widget = :widget
+
+
+
Index: openacs-4/packages/cms/www/modules/types/widget-register-1-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-1-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register-1-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register-1-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -16,5 +16,15 @@
+
+
+
+ update cm_attribute_widgets
+ set is_required = case when is_required = 't'::bool then 'f'::bool else 't'::bool end
+ where attribute_id = :attribute_id
+ and widget = :widget
+
+
+
Index: openacs-4/packages/cms/www/modules/types/widget-register-1.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-1.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register-1.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register-1.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -1,15 +1,6 @@
-
-
-
- update cm_attribute_widgets
- set is_required = case when is_required = 't' then 'f' else 't' end
- where attribute_id = :attribute_id
- and widget = :widget
-
-
Index: openacs-4/packages/cms/www/modules/users/create-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/create-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/create-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/users/create-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -12,7 +12,7 @@
'group',
now(),
:user_id,
- :ip
+ :ip,
:email,
:url,
:group_name,
@@ -28,11 +28,11 @@
select composition_rel__new(
null,
- ''composition_rel'',
+ 'composition_rel',
:parent_id,
:group_id,
:user_id,
- :ip ); end;
+ :ip )
Index: openacs-4/packages/cms/www/modules/users/edit-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/edit-user.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/users/edit-user.tcl 27 May 2001 00:22:34 -0000 1.3
+++ openacs-4/packages/cms/www/modules/users/edit-user.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -50,7 +50,7 @@
if { [form is_request edit_user] } {
# Find basic user params
- query info onerow "
+ template::query get_user_info info onerow "
select
p.first_names, p.last_name,
pp.email, pp.url,
Index: openacs-4/packages/cms/www/modules/users/edit-user.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/edit-user.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/edit-user.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/users/edit-user.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -1,6 +1,27 @@
+
+
+
+ select
+ p.first_names, p.last_name,
+ pp.email, pp.url,
+ u.screen_name,
+ to_char(u.no_alerts_until, 'YYYY/MM/DD') as no_alerts_until
+ from
+ persons p, parties pp, users u
+ where
+ p.person_id = :id
+ and
+ pp.party_id = :id
+ and
+ u.user_id = :id
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/users/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/users/edit.tcl 27 May 2001 00:22:34 -0000 1.3
+++ openacs-4/packages/cms/www/modules/users/edit.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -31,7 +31,7 @@
if { [form is_request edit_group] } {
- query info onerow "
+ template::query get_group_info info onerow "
select
g.group_name, p.url, p.email
from
Index: openacs-4/packages/cms/www/modules/users/edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/edit.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/edit.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/users/edit.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -20,5 +20,19 @@
+
+
+
+ select
+ g.group_name, p.url, p.email
+ from
+ groups g, parties p
+ where
+ g.group_id = :id
+ and
+ p.party_id = :id
+
+
+
Index: openacs-4/packages/cms/www/modules/users/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/index-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/index-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/users/index-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -3,6 +3,109 @@
postgresql7.1
+
+
+
+
+
+ select
+ g.group_id, g.group_name,
+ coalesce(pg.email, ' ') as email,
+ (select count(*) from group_member_map
+ where group_id = g.group_id) as user_count
+ from
+ groups g, parties pg, acs_rels rg, composition_rels rc
+ where
+ g.group_id = pg.party_id
+ and
+ rg.object_id_one = :id
+ and
+ rg.object_id_two = g.group_id
+ and
+ rc.rel_id = rg.rel_id
+ order by
+ upper(g.group_name)
+
+
+
+
+
+
+
+ select
+ u.user_id, ppu.first_names || ' ' || ppu.last_name as pretty_name,
+ coalesce(u.screen_name, ' ') as screen_name,
+ pu.email, aru.member_state,
+ aru.rel_id
+ from
+ users u, persons ppu, parties pu,
+ acs_rels ru, membership_rels aru
+ where
+ u.user_id = ppu.person_id
+ and
+ u.user_id = pu.party_id
+ and
+ ru.object_id_one = :id
+ and
+ ru.object_id_two = u.user_id
+ and
+ aru.rel_id = ru.rel_id
+ and
+ (aru.member_state <> 'deleted' or aru.member_state is null)
+ order by
+ pretty_name
+
+
+
+
+
+
+
+ select
+ g.group_id, g.group_name,
+ coalesce(pg.email, ' ') as email,
+ (select count(*) from group_member_map
+ where group_id = g.group_id) as user_count
+ from
+ groups g, parties pg
+ where
+ g.group_id = pg.party_id
+ and
+ not exists (
+ select 1 from acs_rels ar, composition_rels cr
+ where ar.rel_id = cr.rel_id
+ and ar.object_id_two = g.group_id)
+ order by
+ g.group_name
+
+
+
+
+
+
+
+ select
+ u.user_id, ppu.first_names || ' ' || ppu.last_name as pretty_name,
+ coalesce(u.screen_name, ' ') as screen_name,
+ pu.email, '' as member_state,
+ null as rel_id
+ from
+ users u, persons ppu, parties pu
+ where
+ u.user_id = ppu.person_id
+ and
+ u.user_id = pu.party_id
+ and
+ not exists (
+ select 1 from acs_rels ar, membership_rels mr
+ where ar.rel_id = mr.rel_id
+ and ar.object_id_two = u.user_id)
+ order by
+ pretty_name
+
+
+
+
@@ -30,7 +133,7 @@
select
g.group_id, g.group_name, p.email, p.url,
- coalesce((select 'f' where exists (
+ coalesce((select 'f'::text where exists (
select 1 from acs_rels
where object_id_one = :id
and rel_type in ('composition_rel', 'membership_rel'))),
Index: openacs-4/packages/cms/www/modules/users/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/users/index.tcl 26 May 2001 18:40:15 -0000 1.3
+++ openacs-4/packages/cms/www/modules/users/index.tcl 8 Jun 2001 01:44:53 -0000 1.4
@@ -54,8 +54,8 @@
and
p.party_id = :id"
- set groups_query [db_map get_groups_2]
- set users_query [db_map get_users_2]
+ set groups_query [db_map get_groups_1]
+ set users_query [db_map get_users_1]
set users_eval {
set state_html ""
@@ -101,7 +101,7 @@
set groups_query [db_map get_groups_2]
set users_query [db_map get_users_2]
- set users_eval {}
+ set users_eval {}
}
# Select subgroups, users
Index: openacs-4/packages/cms/www/modules/users/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/index.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/users/index.xql 26 May 2001 18:40:15 -0000 1.2
+++ openacs-4/packages/cms/www/modules/users/index.xql 8 Jun 2001 01:44:53 -0000 1.3
@@ -107,7 +107,7 @@
select
- party_id group_id, 'All Users' as group_name,
+ party_id as group_id, 'All Users' as group_name,
email, url, 'f' as is_empty
from
parties
Index: openacs-4/packages/cms/www/modules/users/make-admin-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/make-admin-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/make-admin-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/users/make-admin-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -17,11 +17,11 @@
end loop;
PERFORM cms_permission__grant_permission (
- content_item.get_root_folder, :user_id, 'cm_admin', :target_user_id, 't'
+ content_item__get_root_folder(null), :user_id, 'cm_admin', :target_user_id, 't'
);
PERFORM cms_permission__grant_permission (
- content_template.get_root_folder, :user_id, 'cm_admin', :target_user_id, 't'
+ content_template__get_root_folder(), :user_id, 'cm_admin', :target_user_id, 't'
);
return null;
Index: openacs-4/packages/cms/www/modules/users/user-assoc-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-assoc-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/user-assoc-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/users/user-assoc-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.2
@@ -15,7 +15,7 @@
from
acs_rels r, membership_rels m
where
- r.object_id_two=$item_id
+ r.object_id_two = $item_id
and
m.rel_id = r.rel_id
loop
@@ -48,10 +48,12 @@
'membership_rel',
:id,
:item_id,
- 'approved'
+ 'approved',
:user_id,
:ip);
end if;
+
+ return null;
end;
Index: openacs-4/packages/cms/www/modules/users/user-assoc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-assoc.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/users/user-assoc.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/users/user-assoc.tcl 8 Jun 2001 01:44:53 -0000 1.3
@@ -38,7 +38,7 @@
} else {
set code {
if { [catch {
- db_exec_plsql user_assoc_root2 "
+ set rel_id [db_exec_plsql user_assoc_root2 "
declare
v_group_id groups.group_id%TYPE;
v_user_id users.user_id%TYPE;
@@ -52,7 +52,7 @@
creation_user => :user_id, creation_ip => :ip);
exception when no_data_found then null;
- end;" [list 1] rel_id
+ end;"]
} errmsg] } {
}
}
Index: openacs-4/packages/cms/www/modules/users/user-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-search.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/users/user-search.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/users/user-search.tcl 8 Jun 2001 01:44:53 -0000 1.3
@@ -82,7 +82,7 @@
set clauses [join $clauses " or "]
- set sql_query "
+ template::query get_results results multirow "
select
distinct u.user_id, u.screen_name,
p.first_names || ' ' || p.last_name as name,
@@ -97,10 +97,6 @@
pp.party_id = u.user_id
$where_clause"
- ns_log notice "$sql_query\n$keyword"
-
- query results multirow $sql_query
-
template::set_file "[file dir $__adp_stub]/search-results"
}
Index: openacs-4/packages/cms/www/modules/users/user-search.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-search.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/users/user-search.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+ select
+ distinct u.user_id, u.screen_name,
+ p.first_names || ' ' || p.last_name as name,
+ pp.email
+ from
+ users u, persons p, parties pp $extra_table
+ where
+ ($clauses)
+ and
+ p.person_id = u.user_id
+ and
+ pp.party_id = u.user_id
+ $where_clause
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workflow/overdue-items-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/overdue-items-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/workflow/overdue-items-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,43 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select
+ ca.transition_key, transition_name, ca.party_id,
+ item_id, content_item.get_title(item_id) as title,
+ nvl(party.name(ca.party_id),person.name(ca.party_id)) as assigned_party,
+ to_char(dead.deadline,'Mon. DD, YYYY') as deadline_pretty,
+ content_workflow.get_status(c.case_id, ca.transition_key) as status
+ from
+ wf_transitions trans, wf_cases c, wf_case_deadlines dead,
+ wf_case_assignments ca, cr_items i
+ where
+ c.case_id = dead.case_id
+ and
+ c.case_id = ca.case_id
+ and
+ ca.transition_key = dead.transition_key
+ and
+ trans.transition_key = ca.transition_key
+ and
+ c.workflow_key = 'publishing_wf'
+ and
+ c.workflow_key = trans.workflow_key
+ and
+ c.state = 'active'
+ and
+ c.object_id = i.item_id
+ and
+ content_workflow.is_overdue(c.case_id, ca.transition_key) = 't'
+ $transition_sql
+ order by
+ transition_name, dead.deadline desc, title, assigned_party
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workflow/overdue-items-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/overdue-items-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/workflow/overdue-items-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,43 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select
+ ca.transition_key, transition_name, ca.party_id,
+ item_id, content_item__get_title(item_id,'f') as title,
+ coalesce(party__name(ca.party_id),person__name(ca.party_id)) as assigned_party,
+ to_char(dead.deadline,'Mon. DD, YYYY') as deadline_pretty,
+ content_workflow__get_status(c.case_id, ca.transition_key) as status
+ from
+ wf_transitions trans, wf_cases c, wf_case_deadlines dead,
+ wf_case_assignments ca, cr_items i
+ where
+ c.case_id = dead.case_id
+ and
+ c.case_id = ca.case_id
+ and
+ ca.transition_key = dead.transition_key
+ and
+ trans.transition_key = ca.transition_key
+ and
+ c.workflow_key = 'publishing_wf'
+ and
+ c.workflow_key = trans.workflow_key
+ and
+ c.state = 'active'
+ and
+ c.object_id = i.item_id
+ and
+ content_workflow__is_overdue(c.case_id, ca.transition_key) = 't'
+ $transition_sql
+ order by
+ transition_name, dead.deadline desc, title, assigned_party
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workflow/overdue-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/overdue-items.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/overdue-items.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/workflow/overdue-items.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -3,7 +3,7 @@
if { ![string equal $transition "all"] } {
- query transition_name onevalue "
+ template::query get_transitoin_name transition_name onevalue "
select transition_name
from wf_transitions
where transition_key = :transition
@@ -19,7 +19,7 @@
set date_format "'Mon. DD, YYYY HH24:MI:SS'"
-query overdue_tasks multirow "
+template::query get_overdue_tasks overdue_tasks multirow "
select
ca.transition_key, transition_name, ca.party_id,
item_id, content_item.get_title(item_id) as title,
Index: openacs-4/packages/cms/www/modules/workflow/overdue-items.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/overdue-items.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/workflow/overdue-items.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+ select transition_name
+ from wf_transitions
+ where transition_key = :transition
+ and workflow_key = 'publishing_wf'
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workspace/assignments-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workspace/assignments-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/workspace/assignments-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,56 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select
+ types.pretty_name,
+ obj.object_id item_id,
+ content_item.get_title(obj.object_id) title,
+ task.task_id,
+ content_workflow.get_holding_user_name(task.task_id) holding_user_name,
+ to_char(task.hold_timeout,'Mon. DD, YYYY') hold_timeout,
+ assign.case_id,
+ trans.transition_name, trans.transition_key,
+ to_char(dead.deadline,'Mon. DD, YYYY') deadline
+ from
+ acs_object_types types,
+ acs_objects obj,
+ wf_case_assignments assign,
+ wf_transitions trans,
+ wf_tasks task,
+ wf_cases case,
+ wf_case_deadlines dead
+ where
+ dead.case_id = case.case_id
+ and
+ dead.transition_key = task.transition_key
+ and
+ assign.party_id = :user_id
+ and
+ assign.case_id = task.case_id
+ and
+ assign.transition_key = task.transition_key
+ and
+ task.state = 'started'
+ and
+ task.transition_key = trans.transition_key
+ and
+ assign.case_id = case.case_id
+ and
+ case.object_id = obj.object_id
+ and
+ types.object_type = content_item.get_content_type(obj.object_id)
+ and
+ task.holding_user ^= :user_id
+ order by
+ dead.deadline
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workspace/assignments-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workspace/assignments-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/workspace/assignments-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,56 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select
+ types.pretty_name,
+ obj.object_id as item_id,
+ content_item__get_title(obj.object_id,'f') as title,
+ task.task_id,
+ content_workflow__get_holding_user_name(task.task_id) as holding_user_name,
+ to_char(task.hold_timeout,'Mon. DD, YYYY') as hold_timeout,
+ assign.case_id,
+ trans.transition_name, trans.transition_key,
+ to_char(dead.deadline,'Mon. DD, YYYY') as deadline
+ from
+ acs_object_types types,
+ acs_objects obj,
+ wf_case_assignments assign,
+ wf_transitions trans,
+ wf_tasks task,
+ wf_cases cases,
+ wf_case_deadlines dead
+ where
+ dead.case_id = cases.case_id
+ and
+ dead.transition_key = task.transition_key
+ and
+ assign.party_id = :user_id
+ and
+ assign.case_id = task.case_id
+ and
+ assign.transition_key = task.transition_key
+ and
+ task.state = 'started'
+ and
+ task.transition_key = trans.transition_key
+ and
+ assign.case_id = cases.case_id
+ and
+ cases.object_id = obj.object_id
+ and
+ types.object_type = content_item__get_content_type(obj.object_id)
+ and
+ task.holding_user != :user_id
+ order by
+ dead.deadline
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workspace/assignments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workspace/assignments.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workspace/assignments.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/workspace/assignments.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -6,7 +6,7 @@
set user_id [User::getID]
-query locked_tasks multirow "
+template::query get_locked_tasks locked_tasks multirow "
select
types.pretty_name,
obj.object_id item_id,
Index: openacs-4/packages/cms/www/modules/workspace/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workspace/index-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/workspace/index-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,57 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select
+ types.pretty_name,
+ obj.object_id item_id,
+ content_item.get_title(obj.object_id) title,
+ task.task_id,
+ task.holding_user,
+ task.state,
+ assign.case_id,
+ trans.transition_name, trans.transition_key,
+ to_char(dead.deadline,'Mon. DD, YYYY') deadline,
+ content_workflow.can_reject(task.task_id, :user_id) can_reject,
+ content_workflow.approve_string(task.task_id, :user_id) approve_string
+ from
+ acs_object_types types,
+ acs_objects obj,
+ wf_case_assignments assign,
+ wf_transitions trans,
+ wf_tasks task,
+ wf_cases case,
+ wf_case_deadlines dead
+ where
+ dead.case_id = case.case_id
+ and
+ dead.transition_key = task.transition_key
+ and
+ assign.party_id = :user_id
+ and
+ assign.case_id = task.case_id
+ and
+ assign.transition_key = task.transition_key
+ and (
+ task.state = 'enabled'
+ or (task.state = 'started' and task.holding_user = :user_id)
+ ) and
+ task.transition_key = trans.transition_key
+ and
+ assign.case_id = case.case_id
+ and
+ case.object_id = obj.object_id
+ and
+ types.object_type = content_item.get_content_type(obj.object_id)
+ order by
+ dead.deadline
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workspace/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workspace/index-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/workspace/index-postgresql.xql 8 Jun 2001 01:44:53 -0000 1.1
@@ -0,0 +1,57 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select
+ types.pretty_name,
+ obj.object_id as item_id,
+ content_item__get_title(obj.object_id,'f') as title,
+ task.task_id,
+ task.holding_user,
+ task.state,
+ assign.case_id,
+ trans.transition_name, trans.transition_key,
+ to_char(dead.deadline,'Mon. DD, YYYY') as deadline,
+ content_workflow__can_reject(task.task_id, :user_id) as can_reject,
+ content_workflow__approve_string(task.task_id, :user_id) as approve_string
+ from
+ acs_object_types types,
+ acs_objects obj,
+ wf_case_assignments assign,
+ wf_transitions trans,
+ wf_tasks task,
+ wf_cases cases,
+ wf_case_deadlines dead
+ where
+ dead.case_id = cases.case_id
+ and
+ dead.transition_key = task.transition_key
+ and
+ assign.party_id = :user_id
+ and
+ assign.case_id = task.case_id
+ and
+ assign.transition_key = task.transition_key
+ and (
+ task.state = 'enabled'
+ or (task.state = 'started' and task.holding_user = :user_id)
+ ) and
+ task.transition_key = trans.transition_key
+ and
+ assign.case_id = cases.case_id
+ and
+ cases.object_id = obj.object_id
+ and
+ types.object_type = content_item__get_content_type(obj.object_id)
+ order by
+ dead.deadline
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/workspace/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workspace/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workspace/index.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/workspace/index.tcl 8 Jun 2001 01:44:53 -0000 1.2
@@ -10,7 +10,9 @@
# first part of the where clause gets all assignments for the individual
# and for any groups to which the individual belongs.
-set query "
+
+
+template::query get_workspace_items items multirow "
select
types.pretty_name,
obj.object_id item_id,
@@ -55,9 +57,7 @@
order by
dead.deadline"
-query items multirow $query
-
# don't cache this page
#ns_set put [ns_conn outputheaders] Pragma "No-cache"
---|
| |