Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql	22 Aug 2003 11:18:28 -0000	1.2
+++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql	17 Oct 2003 00:39:55 -0000	1.3
@@ -5,26 +5,28 @@
 
     <fullquery name="entries">
         <querytext>
-		    select entry_id,
-                           acs_object.name(apm_package.parent_id(e.package_id)) as parent_name,
+		    select e.entry_id,
+                           acs_object.name(apm_package.parent_id(p.package_id)) as parent_name,
                            (select site_node.url(site_nodes.node_id)
-                            from site_nodes
-                            where site_nodes.object_id = e.package_id) as base_url,
-		           title,
-                           content,
-		           p.first_names as poster_first_names,
-		           p.last_name as poster_last_name,
-		           to_char(posted_date , 'HH24:MI') as posted_time_pretty,
-		    from   pinds_blog_entries e,
+                            from   site_nodes
+                            where  site_nodes.object_id = p.package_id) as base_url,
+		           e.title,
+                           e.content,
+		           u.first_names as poster_first_names,
+		           u.last_name as poster_last_name,
+		           to_char(e.posted_date , 'HH24:MI') as posted_time_pretty,
+                           p.package_id
+		    from   apm_packages p,
+                           pinds_blog_entries e,
 		           acs_objects o,
-		           persons p
-		    where  e.entry_id = o.object_id
-		    and    p.person_id = o.creation_user
-		    and    package_id = :package_id
-		    and    $date_clause
-		    and    draft_p = 'f'
-		    and    deleted_p = 'f'
-		    order  by entry_date desc, posted_date desc
+		           all_users u
+		    where  p.package_id in ([join $list_of_package_ids ", "])
+                    and    e.package_id (+) = p.package_id
+                    and    o.object_id (+) = e.entry_id
+		    and    u.user_id (+) = o.creation_user 
+		    and    e.draft_p (+) = 'f'
+		    and    e.deleted_p (+) = 'f'
+		    order  by p.package_id asc, e.entry_date desc, e.posted_date desc
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql	22 Aug 2003 11:18:28 -0000	1.2
+++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql	17 Oct 2003 00:39:56 -0000	1.3
@@ -5,25 +5,26 @@
 
     <fullquery name="entries">
         <querytext>
-		    select entry_id,
+		    select e.entry_id,
                            acs_object__name(apm_package__parent_id(e.package_id)) as parent_name,
                            (select site_node__url(site_nodes.node_id)
                                from site_nodes
                                where site_nodes.object_id = e.package_id) as base_url,
-		           title,
-		           content,
-                           p.first_names as poster_first_names,
-		           p.last_name as poster_last_name,
-			   to_char(posted_date , 'HH24:MI') as posted_time_pretty,
-                           package_id
-		    from   pinds_blog_entries e join 
+		           e.title,
+		           e.content,
+                           u.first_names as poster_first_names,
+		           u.last_name as poster_last_name,
+			   to_char(e.posted_date , 'HH24:MI') as posted_time_pretty,
+                           p.package_id
+		    from   apm_packages p left outer join 
+                           pinds_blog_entries e on (e.package_id = p.package_id) join 
 		           acs_objects o on (o.object_id = e.entry_id) join 
-		           persons p on (p.person_id = o.creation_user)
-		    where  package_id in ([join $list_of_package_ids ", "])
-		    and    entry_date > current_timestamp - interval '30 days'
-		    and    draft_p = 'f'
-		    and    deleted_p = 'f'
-		    order  by entry_date desc, posted_date desc
+		           all_users u on (u.user_id = o.creation_user)
+		    where  p.package_id in ([join $list_of_package_ids ", "])
+		    and    e.entry_date > current_timestamp - interval '30 days'
+		    and    e.draft_p = 'f'
+		    and    e.deleted_p = 'f'
+		    order  by p.package_id asc, e.entry_date desc, e.posted_date desc
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp	22 Aug 2003 11:18:28 -0000	1.2
+++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp	17 Oct 2003 00:39:56 -0000	1.3
@@ -1,53 +1,35 @@
 <if @read_p@ true>
-<if @shaded_p@ ne "t">
+  <if @shaded_p@ ne "t">
 
-  <if @entries:rowcount@ gt 0>
-
-<%
-    set new_package_id ""
-    set old_package_id ""
-%>
-
-<multiple name="entries">
-
-<% set new_package_id $entries(package_id) %>
-
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
-      </ul>
+    <if @entries:rowcount@ gt 0>
+      <multiple name="entries">
+        @entries.parent_name@
+        <ul>
+          <group column="package_id">
+            <if @entries.entry_id@ not nil>
+              <li>
+                <p>
+                  <b><a href="@entries.view_url@" title="View this entry">@entries.title@</a></b> <br />
+                  @entries.content@
+                  <br><b>by @entries.poster_first_names@ @entries.poster_last_name@</b>
+                  <small>(@entries.posted_time_pretty@)</small>
+                </p>
+              </li>
+            </if>
+          </group>
+        </ul>
+        <if @entries.add_url@ not nil>
+          <p>
+            <b>&raquo;</b> <a href="@entries.add_url@">Add entry</a>
+          </p>
+        </if>
+      </multiple>
     </if>
-
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-      @entries.parent_name@
-      <ul>
-    </if>
-
-    <li>
-      <p>
-        <b><a href="@entries.view_url@" title="View this entry">@entries.title@</a></b> <br />
-        @entries.content@
-        <b>by @entries.poster_first_names@ @entries.poster_last_name@</b>
-        <small>(@entries.posted_time_pretty@)</small>
-      </p>
-    </li>
-
-<%
-    set old_package_id $new_package_id
-%>
-</multiple>
-
-  <if @write_p@ eq 1>
-    <p>
-      <b>&raquo;</b> <a href="@entries.add_url@">Add entry</a>
-    </p>
+    <else>
+      <small>No Entries</small>
+    </else>
   </if>
-
-  </if>
   <else>
-    <small>No Entries</small>
+  &nbsp;
   </else>
-
 </if>
-<else>
-&nbsp;
-</else>
-</if>
Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl	22 Aug 2003 11:18:28 -0000	1.2
+++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet.tcl	17 Oct 2003 00:39:56 -0000	1.3
@@ -25,15 +25,23 @@
 set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
 
 set read_p 0
+array set package_read_p [list]
+array set package_create_p [list]
 foreach package_id $config(package_id) {
-    if {[permission::permission_p -object_id $package_id -privilege read]} {
+    set package_read_p($package_id) [permission::permission_p -object_id $package_id -privilege read]
+    set package_create_p($package_id) [permission::permission_p -object_id $package_id -privilege create]
+    if { $package_read_p($package_id) } {
         set read_p 1
-        break
     }
 }
 
 db_multirow -extend { view_url add_url } entries entries {} {
+    if { !$package_read_p($package_id) } {
+        continue
+    }
     set content [string_truncate -len 100 $content]
     set view_url "${base_url}one-entry?[export_vars { entry_id }]"
-    set add_url "${base_url}entry-edit"
+    if { $package_create_p($package_id) } {
+        set add_url "${base_url}entry-edit"
+    }
 }