Index: openacs-4/packages/news/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/news/www/admin/index.adp 15 May 2007 20:14:50 -0000 1.15
+++ openacs-4/packages/news/www/admin/index.adp 1 Aug 2008 12:56:43 -0000 1.15.2.1
@@ -4,10 +4,10 @@
@title;noquote@
@@ -39,9 +39,9 @@
|
- @news_items.item_id@ |
- @news_items.publish_title@ (#news.rev# @news_items.revision_no@) #news.revise# |
- @news_items.item_creator@ |
+ @news_items.item_id@ |
+ @news_items.publish_title@ (#news.rev# @news_items.revision_no@) #news.revise# |
+ @news_items.item_creator@ |
@news_items.publish_date_pretty@ |
@news_items.archive_date_pretty@ |
@news_items.pretty_status@ |
Index: openacs-4/packages/news/www/admin/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.adp,v
diff -u -r1.7.8.1 -r1.7.8.2
--- openacs-4/packages/news/www/admin/revision.adp 29 Jul 2008 17:22:17 -0000 1.7.8.1
+++ openacs-4/packages/news/www/admin/revision.adp 1 Aug 2008 12:56:43 -0000 1.7.8.2
@@ -3,18 +3,14 @@
@title;noquote@
-
- #news.lt_Could_not_find_corres#
-
-
#news.Author#: @creator_link;noquote@
#news.Revision_number#: @revision_no@
- #news.Creation_Date#: @creation_date@
+ #news.Creation_Date#: @creation_date_pretty@
#news.Creation_IP#: @creation_ip@
- #news.Release_Date#: @publish_date@
- #news.Archive_Date#: @archive_date@
+ #news.Release_Date#: @publish_date_pretty@
+ #news.Archive_Date#: @archive_date_pretty@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: openacs-4/packages/news/www/admin/revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.tcl,v
diff -u -r1.7 -r1.7.8.1
--- openacs-4/packages/news/www/admin/revision.tcl 24 Feb 2005 18:03:05 -0000 1.7
+++ openacs-4/packages/news/www/admin/revision.tcl 1 Aug 2008 12:56:43 -0000 1.7.8.1
@@ -30,32 +30,16 @@
# Access a news item in a particular revision
-set item_exist_p [db_0or1row one_item "
- select item_id,
- revision_id,
- content_revision.get_number(:revision_id) as revision_no,
- publish_title,
- publish_lead,
- html_p,
- publish_date,
- archive_date,
- creation_ip,
- creation_date,
- '' || item_creator || '' as creator_link
- from news_item_revisions
- where item_id = :item_id
- and revision_id = :revision_id"]
+set item_exist_p [db_0or1row one_item {}]
if { $item_exist_p } {
# workaround to get blobs with >4000 chars into a var, content.blob_to_string fails!
# when this'll work, you get publish_body by selecting 'publish_body' directly from above view
#
set get_content [db_map get_content]
- if {![string match $get_content ""]} {
- set publish_body [db_string get_content "select content
- from cr_revisions
- where revision_id = :revision_id"]
+ if { $get_content ne "" } {
+ set publish_body [db_string get_content {}]
}
# text-only body
@@ -65,17 +49,19 @@
#if {[info exists html_p] && ![string equal $html_p "t"]} {
# set publish_body "[ad_quotehtml $publish_body]"
#}
- if {[info exists html_p] && [string equal $html_p "f"]} {
+ if { !$html_p } {
set publish_body [ad_text_to_html -- $publish_body]
}
- set title "Revision"
+ set title [_ news.Revision]
set context [list [list "item?[export_vars -url item_id]" [_ news.One_Item]] $title]
+
+ set creation_date_pretty [lc_time_fmt $creation_date %q]
+ set publish_date_pretty [lc_time_fmt $publish_date %q]
+ set archive_date_pretty [lc_time_fmt $archive_date %q]
} else {
- set context {}
- set title "[_ news.Error]"
+ ad_return_complaint 1 [_ news.lt_Could_not_find_corres]
}
ad_return_template
-