Index: openacs-4/packages/news-aggregator/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/news-aggregator/www/index.adp 18 Jul 2018 13:36:11 -0000 1.16 +++ openacs-4/packages/news-aggregator/www/index.adp 18 Jul 2018 13:51:50 -0000 1.17 @@ -29,10 +29,12 @@ This page lists the most recent items from the feeds you've subscribed to. - + You can hit the Purge button to clean out the page. Clicking the Save icon Save will prevent an item from being purged. - Click on the #news-aggregator.Post# icon Post this item to your Weblog to add the item to your weblog. + + Click on the #news-aggregator.Post# icon Post this item to your Weblog to add the item to your weblog. +

Index: openacs-4/packages/news-aggregator/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/news-aggregator/www/index.tcl 18 Jul 2018 13:36:11 -0000 1.18 +++ openacs-4/packages/news-aggregator/www/index.tcl 18 Jul 2018 13:51:50 -0000 1.19 @@ -90,6 +90,8 @@ set create_url "${package_url}/aggregator" +set purge_p [expr {$enable_purge_p && $purge_p}] + # We only handle purges if the aggregator is not public if { $enable_purge_p || !$public_p || $purge_p } { set purges [db_list_of_lists purges { @@ -192,14 +194,16 @@ } if {$write_p} { - if {$item_id ni $saved_items} { - set save_url [export_vars -base "${url}item-save" {item_id}] - set unsave_url "" - } else { - set unsave_url [export_vars -base "${url}item-unsave" {item_id}] - set save_url "" + if {!$public_p} { + set item_blog_url [export_vars -base "${url}item-blog" {item_id}] } - set item_blog_url [export_vars -base "${url}item-blog" {item_id}] + if {$purge_p} { + if {$item_id ni $saved_items} { + set save_url [export_vars -base "${url}item-save" {item_id}] + } else { + set unsave_url [export_vars -base "${url}item-unsave" {item_id}] + } + } } if { $item_id < $bottom } { @@ -215,7 +219,8 @@ set purge [expr {$enable_purge_p && $top >= $bottom && !$public_p - && $write_p}] + && $write_p + && $purge_p}] if {$purge} { ad_form -name purge -action "[ad_conn package_url]$aggregator_id/purge" -form { {purge_top:integer(hidden)