+Attach a File to @pretty_object_name@
+@context@
You are attaching a document to @pretty_object_name@.
@@ -22,8 +22,8 @@
URL
-
-
+
+
+
+
+
+
+
+
 |
Index: openacs-4/packages/attachments/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/attachments/www/attach.tcl 10 Sep 2002 22:22:22 -0000 1.4
+++ openacs-4/packages/attachments/www/attach.tcl 17 Sep 2002 21:08:38 -0000 1.5
@@ -1,4 +1,3 @@
-
ad_page_contract {
Attach something to an object
@@ -46,12 +45,8 @@
set folder_name [fs::get_object_name -object_id $folder_id]
# Folder contents
-set rows [fs::get_folder_contents \
- -folder_id $folder_id \
- -user_id $user_id]
+db_multirow contents select_folder_contents {}
-template::util::list_of_ns_sets_to_multirow -rows $rows -var_name "contents"
-
set passthrough_vars "object_id=$object_id&return_url=[ns_urlencode $return_url]&pretty_object_name=[ns_urlencode $pretty_object_name]"
if {$folder_id == $root_folder_id} {
@@ -60,6 +55,5 @@
set fs_context_bar_html [attachments::context_bar -extra_vars $passthrough_vars -folder_id $folder_id]
}
-set context_bar {Attach}
+set context "Attach"
-ad_return_template
Index: openacs-4/packages/attachments/www/attach.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/attachments/www/attach.xql 17 Sep 2002 21:08:38 -0000 1.1
@@ -0,0 +1,22 @@
+
+
+
+
+
+ select fs_objects.object_id,
+ fs_objects.name,
+ fs_objects.live_revision,
+ fs_objects.type,
+ to_char(fs_objects.last_modified, 'Month DD YYYY HH24:MI') as last_modified,
+ fs_objects.content_size,
+ fs_objects.url,
+ fs_objects.key,
+ fs_objects.sort_key,
+ fs_objects.file_upload_name,
+ '0' as new_p
+ from fs_objects
+ where fs_objects.parent_id = :folder_id
+ order by sort_key, name
+
+
+
\ No newline at end of file
Index: openacs-4/packages/attachments/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/attachments/www/file-add.adp 12 Jul 2002 14:19:06 -0000 1.3
+++ openacs-4/packages/attachments/www/file-add.adp 17 Sep 2002 21:08:38 -0000 1.4
@@ -1,6 +1,6 @@
-
+
Upload New Attachment
-@context_bar@
+@context@
You are attaching a new document to @pretty_object_name@.
Index: openacs-4/packages/attachments/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/attachments/www/file-add.tcl 2 Jul 2002 19:41:20 -0000 1.2
+++ openacs-4/packages/attachments/www/file-add.tcl 17 Sep 2002 21:08:38 -0000 1.3
@@ -19,7 +19,7 @@
}
} -properties {
folder_id:onevalue
- context_bar:onevalue
+ context:onevalue
title:onevalue
lock_title_p:onevalue
}
@@ -30,8 +30,8 @@
# set templating datasources
-set context_bar {{Attach File}}
-set fs_context_bar [fs_context_bar_list -final "Add File" $folder_id]
+set context {{Attach File}}
+set fs_context [fs_context_bar_list -final "Add File" $folder_id]
# Should probably generate the item_id and version_id now for
# double-click protection
Index: openacs-4/packages/attachments/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/simple-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/attachments/www/simple-add.adp 12 Jul 2002 14:19:06 -0000 1.3
+++ openacs-4/packages/attachments/www/simple-add.adp 17 Sep 2002 21:08:38 -0000 1.4
@@ -1,6 +1,6 @@
-
+
Attach URL
-@context_bar@
+@context@
You are attaching a new url to @pretty_object_name@.
Index: openacs-4/packages/attachments/www/simple-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/simple-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/attachments/www/simple-add.tcl 10 Sep 2002 22:22:22 -0000 1.3
+++ openacs-4/packages/attachments/www/simple-add.tcl 17 Sep 2002 21:08:38 -0000 1.4
@@ -21,7 +21,7 @@
}
} -properties {
folder_id:onevalue
- context_bar:onevalue
+ context:onevalue
}
# check for write permission on the folder
@@ -35,7 +35,7 @@
return -code error "No such type"
}
-set context_bar {{Attach URL}}
+set context {{Attach URL}}
set fs_context_bar [fs_context_bar_list -final "Add $pretty_name" $folder_id]
# Should probably generate the item_id and version_id now for