Index: openacs-4/contrib/packages/events/TODO =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/TODO,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/TODO 9 Mar 2003 12:07:04 -0000 1.1 +++ openacs-4/contrib/packages/events/TODO 4 Jun 2003 01:43:10 -0000 1.2 @@ -21,7 +21,6 @@ - adjust order-one, event-info, activity ! acs_event.new doesn't accept related_url arg (even though it's in acs_events) so deal with this later? - ask someone on irc to commit changes to plsql interface -o remove unnecessary permissions... as it stands we don't need any special permissions (it only relies on read, write and admin) wish list --------- @@ -35,6 +34,10 @@ -- THINGS THAT HAVE BEEN FINISHED ------------------------------ +DRB + +o remove unnecessary permissions... as it stands we don't need any special permissions (it only relies on read, write and admin) + MICHAEL o integrate with attachments for agenda upload o move common queries from *.xql to procs (done?) MATTHEW AGREES THAT THIS IS DONE Index: openacs-4/contrib/packages/events/sql/oracle/events-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/sql/oracle/events-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/sql/oracle/events-create.sql 9 Mar 2003 12:07:16 -0000 1.1 +++ openacs-4/contrib/packages/events/sql/oracle/events-create.sql 4 Jun 2003 01:43:29 -0000 1.2 @@ -38,6 +38,3 @@ -- events package (references custom fields) @ events-events-package-create.sql @ events-activities-package-create.sql - --- events permissions -@ events-permissions-create.sql \ No newline at end of file Index: openacs-4/contrib/packages/events/sql/oracle/events-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/sql/oracle/events-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/sql/oracle/events-drop.sql 9 Mar 2003 12:07:17 -0000 1.1 +++ openacs-4/contrib/packages/events/sql/oracle/events-drop.sql 4 Jun 2003 01:43:29 -0000 1.2 @@ -36,6 +36,3 @@ -- event venues @ events-venues-drop.sql @ events-venues-package-drop.sql - --- events permissions -@ events-permissions-drop.sql Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/events/sql/oracle/events-permissions-create.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/events/sql/oracle/events-permissions-drop.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/contrib/packages/events/sql/postgresql/events-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/sql/postgresql/events-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/sql/postgresql/events-create.sql 9 Mar 2003 12:07:30 -0000 1.1 +++ openacs-4/contrib/packages/events/sql/postgresql/events-create.sql 4 Jun 2003 01:43:44 -0000 1.2 @@ -39,5 +39,3 @@ -- event organizers \i events-organizers-create.sql --- events permissions -\i events-permissions-create.sql Index: openacs-4/contrib/packages/events/sql/postgresql/events-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/sql/postgresql/events-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/sql/postgresql/events-drop.sql 9 Mar 2003 12:07:30 -0000 1.1 +++ openacs-4/contrib/packages/events/sql/postgresql/events-drop.sql 4 Jun 2003 01:43:44 -0000 1.2 @@ -36,6 +36,3 @@ -- event venues \i events-venues-drop.sql \i events-venues-package-drop.sql - --- events permissions -\i events-permissions-drop.sql Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/events/sql/postgresql/events-permissions-create.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/events/sql/postgresql/events-permissions-drop.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/contrib/packages/events/tcl/venues-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/tcl/venues-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/tcl/venues-procs.tcl 9 Mar 2003 12:07:42 -0000 1.1 +++ openacs-4/contrib/packages/events/tcl/venues-procs.tcl 4 Jun 2003 01:43:59 -0000 1.2 @@ -314,7 +314,7 @@ {-package_id ""} {-sql_p "f"} } { - return any and all connecting venues or null or '' (if sql_p) if there aren't any. + return any and all connecting venues or "" or NULL (if sql_p) if there aren't any. @return any and all connecting venues } { @@ -340,7 +340,7 @@ } if { $sql_p && [empty_string_p $rval] } { - return "''" + return "NULL" } else { return $rval } @@ -425,7 +425,7 @@ if { $sql_p } { if { [empty_string_p $rval] } { - return "''" + return "NULL" } else { regsub -all " " $rval "," rval } @@ -488,7 +488,7 @@ if { $sql_p } { if { [empty_string_p $rval] } { - set rval "''" + set rval "NULL" } else { regsub -all " " $rval ", " rval } @@ -570,4 +570,4 @@ return $rval } -} \ No newline at end of file +} Index: openacs-4/contrib/packages/events/www/event-info.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/event-info.adp,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/packages/events/www/event-info.adp 22 May 2003 13:51:55 -0000 1.5 +++ openacs-4/contrib/packages/events/www/event-info.adp 4 Jun 2003 01:44:15 -0000 1.6 @@ -102,10 +102,10 @@ - +

Related Web Site: - @detail_url@ + @event_info.detail_url@

@@ -128,4 +128,4 @@

- \ No newline at end of file + Index: openacs-4/contrib/packages/events/www/event-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/event-info.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/events/www/event-info.tcl 9 Mar 2003 16:27:28 -0000 1.2 +++ openacs-4/contrib/packages/events/www/event-info.tcl 4 Jun 2003 01:44:15 -0000 1.3 @@ -63,17 +63,7 @@ } } -if { ![empty_string_p $event_info(detail_url)] } { - set detail_url "[ad_convert_to_html $event_info(detail_url)]" - if { ![ad_looks_like_html_p $detail_url] } { - set detail_url "$detail_url" - } -} else { - set detail_url {} -} - set title "$event_info(name) in $event_info(city) on $event_info(timespan)" set context [list "$event_info(name) in $event_info(city)"] - ad_return_template Index: openacs-4/contrib/packages/events/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/events/www/index.adp 22 May 2003 13:51:55 -0000 1.4 +++ openacs-4/contrib/packages/events/www/index.adp 4 Jun 2003 01:44:15 -0000 1.5 @@ -29,7 +29,7 @@   - @events.description@ + @events.description;noquote@ Index: openacs-4/contrib/packages/events/www/order-one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-one.adp,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/events/www/order-one.adp 22 May 2003 13:51:55 -0000 1.3 +++ openacs-4/contrib/packages/events/www/order-one.adp 4 Jun 2003 01:44:15 -0000 1.4 @@ -1,5 +1,5 @@ -Register for @event_info.name;noquote@ +Register for @event_info.name@ @context;noquote@

Index: openacs-4/contrib/packages/events/www/order-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-one.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/events/www/order-one.tcl 13 Mar 2003 09:47:09 -0000 1.3 +++ openacs-4/contrib/packages/events/www/order-one.tcl 4 Jun 2003 01:44:15 -0000 1.4 @@ -11,9 +11,6 @@ @cvs_id $Id order-one.tcl,v 3.19.2.5 2000/09/22 01:37:33 kevin Exp $ } { {event_id:integer,notnull} -} -properties { - - detail_url:onevalue } -validate { event_exists_p -requires {event_id} { if { ![events::event::exists_p -event_id $event_id] } { @@ -47,10 +44,6 @@ set context [list [list "event-info?event_id=$event_id" "$event_info(name) in $event_info(city)"] Register] -set detail_url [ad_convert_to_html $event_info(detail_url)] - - - multirow create reg_notes note Index: openacs-4/contrib/packages/events/www/admin/activity.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity.adp,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/events/www/admin/activity.adp 22 May 2003 13:52:52 -0000 1.2 +++ openacs-4/contrib/packages/events/www/admin/activity.adp 4 Jun 2003 01:44:50 -0000 1.3 @@ -6,10 +6,8 @@