Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/oracle/fs-contents-portlet-mods.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/postgresql/fs-contents-portlet-mods.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/Attic/fs-contents-portlet-oracle.xql,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet-oracle.xql 31 May 2002 06:34:27 -0000 1.1
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet-oracle.xql 17 Oct 2002 10:30:07 -0000 1.1.2.1
@@ -13,6 +13,7 @@
from site_nodes
where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
fs_objects.object_id,
+ fs_objects.file_upload_name,
fs_objects.name,
fs_objects.live_revision,
fs_objects.type,
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/Attic/fs-contents-portlet-postgresql.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet-postgresql.xql 12 Aug 2002 13:40:08 -0000 1.2
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet-postgresql.xql 17 Oct 2002 10:30:07 -0000 1.2.2.1
@@ -16,6 +16,7 @@
where site_nodes.object_id = file_storage__get_package_id(fs_objects.object_id))
END) as url,
fs_objects.object_id,
+ fs_objects.file_upload_name,
fs_objects.name,
fs_objects.live_revision,
fs_objects.type,
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp 9 Aug 2002 18:39:32 -0000 1.7
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp 17 Oct 2002 10:30:07 -0000 1.7.2.1
@@ -34,44 +34,5 @@
</td>
</tr>
</if>
-
-<multiple name="folders">
-
- <tr>
-
-<if @folders.type@ eq "folder">
- <td><img border="0" src="@folders.url@graphics/folder.gif"></td>
- <td><a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a></td>
- <td><small>@folders.type@</small></td>
-<if @folders.content_size@ eq 0>
- <td><small>0 items</small></td>
-</if>
-<else>
-<if @folders.content_size@ gt 1>
- <td><small>@folders.content_size@ items</small></td>
-</if>
-<else>
- <td><small>@folders.content_size@ item</small></td>
-</else>
-</else>
-</if>
-<else>
-<if @folders.type@ eq "url">
- <td><img border="0" src="@folders.url@graphics/file.gif"></td>
- <td><a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a></td>
- <td><small>@folders.type@</small></td>
- <td> </td>
-</if>
-<else>
- <td><img border="0" src="@folders.url@graphics/file.gif"></td>
- <td><a href="@folders.url@download/@folders.name@?version_id=@folders.live_revision@">@folders.name@</a></td>
- <td><small>@folders.type@</small></td>
- <td><small>@folders.content_size@ byte<if @folders.content_size ne 1>s</if></small></td>
-</else>
-</else>
-
- </tr>
-
-</multiple>
-
- </table>
+</table>
+<include src=@scope_fs_url@ folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
\ No newline at end of file
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl 9 Aug 2002 18:39:32 -0000 1.4
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl 17 Oct 2002 10:30:07 -0000 1.4.2.1
@@ -48,6 +48,8 @@
}
set folder_id [lindex $list_of_folder_ids 0]
+set scope_fs_url "/packages/file-storage/www/folder-chunk"
+set n_past_days ""
set url [site_node_object_map::get_url -object_id $folder_id]
set recurse_p 1
set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
Index: openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql 22 May 2002 08:50:54 -0000 1.9
+++ openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql 17 Oct 2002 10:30:07 -0000 1.9.2.1
@@ -14,6 +14,7 @@
where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
fs_objects.object_id,
fs_objects.name,
+ fs_objects.file_upload_name,
fs_objects.live_revision,
fs_objects.type,
fs_objects.content_size
@@ -36,6 +37,7 @@
where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
fs_objects.object_id,
fs_objects.name,
+ fs_objects.file_upload_name,
fs_objects.live_revision,
fs_objects.type,
fs_objects.content_size
@@ -49,3 +51,10 @@
</fullquery>
</queryset>
+
+
+
+
+
+
+
Index: openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql 24 Jul 2002 15:34:40 -0000 1.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql 17 Oct 2002 10:30:07 -0000 1.1.2.1
@@ -17,6 +17,7 @@
END) as url,
fs_objects.object_id,
fs_objects.name,
+ fs_objects.file_upload_name,
fs_objects.live_revision,
fs_objects.type,
fs_objects.content_size
@@ -42,6 +43,7 @@
END) as url,
fs_objects.object_id,
fs_objects.name,
+ fs_objects.file_upload_name,
fs_objects.live_revision,
fs_objects.type,
fs_objects.content_size
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -r1.21 -r1.21.2.1
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp 9 Aug 2002 18:39:32 -0000 1.21
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp 17 Oct 2002 10:30:07 -0000 1.21.2.1
@@ -20,9 +20,8 @@
<if @config.shaded_p@ false>
-<if @n_folders@ eq 1 or @user_root_folder_present_p@ true>
<if @write_p@ true>
- <table>
+ <table width="100%">
<tr>
<td>
<nobr>
@@ -36,97 +35,90 @@
</nobr>
</td>
</tr>
- <tr>
- <td>
- <br>
- <nobr>
- <small>
- View files modified in the last
- <a href="@contents_url@n_past_days=999999">All</a>
- |
- <a href="@contents_url@n_past_days=1">1</a>
- |
- <a href="@contents_url@n_past_days=2">2</a>
- |
- <a href="@contents_url@n_past_days=3">3</a>
- |
- <a href="@contents_url@n_past_days=7">7</a>
- |
- <a href="@contents_url@n_past_days=14">14</a>
- |
- <a href="@contents_url@n_past_days=30">30</a>
- days.
- </small>
- </nobr>
- </td>
- </tr>
</table>
- <br>
</if>
-</if>
- <table border="0" cellpadding="2" cellspacing="2" width="100%">
-<multiple name="folders">
- <tr>
-<if @folders.type@ eq "folder">
- <td>
- <img border="0" src="@folders.url@graphics/folder.gif">
- </td>
- <td>
- <a href="@folders.url@?folder_id=@folders.object_id@">
- @folders.name@
- </a>
- </td>
- <td><small>@folders.type@</small></td>
-<if @folders.content_size@ eq 0>
- <td><small>0 items</small></td>
- <td> </td>
+
+<if @scoped_p@ eq 1>
+<include src=@scope_fs_url@ folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
</if>
+
+
<else>
- <if @folders.content_size@ gt 1>
- <td><small>@folders.content_size@ items</small></td>
- </if>
- <else>
- <td><small>@folders.content_size@ item</small></td>
- </else>
+
+ <table class="table-display" border="0" cellpadding="3" cellspacing="0" width="100%">
+ <multiple name="folders">
+ <if @folders.rownum@ odd>
+ <tr class="z_dark">
+ </if>
+ <else>
+ <tr class="z_light">
+ </else>
+
+ <if @folders.type@ eq "folder">
+ <td>
+ <a href="@folders.url@?folder_id=@folders.object_id@">
+ <img border="0" src="/graphics/folder.gif" height="14" width="14">
+ </a>
+ </td>
+ <td>
+ <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>
+ </td>
+ <td><small>@folders.type@</small></td>
+ <if @folders.content_size@ eq 0>
+ <td><small>0 items</small></td>
+ </if>
+ <else>
+ <if @folders.content_size@ gt 1>
+ <td><small>@folders.content_size@ items</small></td>
+ </if>
+ <else>
+ <td><small>@folders.content_size@ item</small></td>
+ </else>
+ <td> </td>
+ </else>
+ </if>
+ <else>
+ <if @folders.type@ eq "url">
+ <td>
+ <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/graphics/file.gif"></a>
+ </td>
+ <td>
+ <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
+ </td>
+ <td><small>@folders.type@</small></td>
+ <td><small> </small></td>
+ <td><small> </small></td>
+ </if>
+ <else>
+ <td>
+ <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@"><img border="0" src="/graphics/file.gif"></a>
+ </td>
+ <td>
+ <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
+ </td>
+ <td><small>@folders.type@</small></td>
+ <td><small>@folders.content_size@ byte<if @folders.content_size ne 1>s</if></small></td>
+ <td>
+ <nobr> <small>[<a href="@folders.url@file?file_id=@folders.object_id@">view details</a>]</small>
+ </nobr>
+ </td>
+ </else>
+ </else>
+ </tr>
+ </multiple>
+ </table>
+
</else>
-</if>
-<else>
-<if @folders.type@ eq "url">
- <td>
- <img border="0" src="@folders.url@graphics/file.gif">
- </td>
- <td>
- <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
- </td>
- <td><small>@folders.type@</small></td>
- <td><small> </small></td>
- <td><small> </small></td>
-</if>
-<else>
- <td>
- <img border="0" src="@folders.url@graphics/file.gif">
- </td>
- <td>
- <a href="@folders.url@download/@folders.name@?version_id=@folders.live_revision@">@folders.name@</a>
- </td>
- <td><small>@folders.type@</small></td>
- <td><small>@folders.content_size@ byte<if @folders.content_size ne 1>s</if></small></td>
- <td>
- <nobr>
- <small>[
- <a href="@folders.url@file?file_id=@folders.object_id@">view details</a>
- ]</small>
- </nobr>
- </td>
-</else>
-</else>
- </tr>
-</multiple>
- </table>
+
+
+
</if>
<else>
</else>
+
+
+
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl 9 Aug 2002 18:39:32 -0000 1.15
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl 17 Oct 2002 10:30:07 -0000 1.15.2.1
@@ -72,11 +72,11 @@
set delete_p [permission::permission_p -object_id $folder_id -privilege "delete"]
}
-set query "select_folder_contents"
-if {!$scoped_p} {
- set query "select_folders"
+set query "select_folders"
+if {$scoped_p} {
+ set scope_fs_url "/packages/file-storage/www/folder-chunk"
+} else {
+ db_multirow folders $query {}
}
-db_multirow folders $query {}
-
ad_return_template