Index: openacs-4/packages/news/www/admin/approve-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve-2-oracle.xql,v diff -u -r1.1 -r1.1.30.1 --- openacs-4/packages/news/www/admin/approve-2-oracle.xql 15 Oct 2001 13:41:03 -0000 1.1 +++ openacs-4/packages/news/www/admin/approve-2-oracle.xql 23 Mar 2023 13:38:40 -0000 1.1.30.1 @@ -10,8 +10,8 @@ news.set_approve( approve_p => 't', revision_id => :id, - publish_date => :publish_date_ansi, - archive_date => :archive_date_ansi, + publish_date => :publish_date, + archive_date => :archive_date, approval_user => :approval_user, approval_date => :approval_date, approval_ip => :approval_ip, Index: openacs-4/packages/news/www/admin/approve-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve-2-postgresql.xql,v diff -u -r1.1 -r1.1.30.1 --- openacs-4/packages/news/www/admin/approve-2-postgresql.xql 15 Oct 2001 13:41:03 -0000 1.1 +++ openacs-4/packages/news/www/admin/approve-2-postgresql.xql 23 Mar 2023 13:38:40 -0000 1.1.30.1 @@ -9,8 +9,8 @@ select news__set_approve( :id, -- p_revision_id 't', -- p_approve_p - :publish_date_ansi, -- p_publish_date - :archive_date_ansi, -- p_archive_date + :publish_date, -- p_publish_date + :archive_date, -- p_archive_date :approval_user, -- p_approval_user :approval_date, -- p_approval_date :approval_ip, -- p_approval_ip Index: openacs-4/packages/news/www/admin/approve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve-2.tcl,v diff -u -r1.9.2.2 -r1.9.2.3 --- openacs-4/packages/news/www/admin/approve-2.tcl 27 Jan 2023 17:11:53 -0000 1.9.2.2 +++ openacs-4/packages/news/www/admin/approve-2.tcl 23 Mar 2023 13:38:40 -0000 1.9.2.3 @@ -14,24 +14,20 @@ revision_id:naturalnum,notnull,multiple {return_url:localurl ""} {permanent_p:boolean "f"} - {publish_date:array,date ""} - {archive_date:array,date ""} + {publish_date:clock(%Y-%m-%d) ""} + {archive_date:clock(%Y-%m-%d) ""} } # read dates and prepare in ANSI form -set publish_date_ansi $publish_date(date) +if {$permanent_p} { -if {$permanent_p == "t"} { + set archive_date "" - set archive_date_ansi "" - } else { - set archive_date_ansi $archive_date(date) - - if { [dt_interval_check $archive_date_ansi $publish_date_ansi] >= 0 } { + if { [dt_interval_check $archive_date $publish_date] >= 0 } { ad_return_error "[_ news.Scheduling_Error]" \ "[_ news.lt_The_archive_date_must]" ad_script_abort Index: openacs-4/packages/news/www/admin/approve.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve.adp,v diff -u -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/news/www/admin/approve.adp 27 Jan 2023 17:11:53 -0000 1.13.2.1 +++ openacs-4/packages/news/www/admin/approve.adp 23 Mar 2023 13:38:40 -0000 1.13.2.2 @@ -32,10 +32,10 @@
-@publish_date_select;noquote@
+ -@archive_date_select;noquote@
+
#news.show_it_permanently#