Index: openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl 15 Mar 2004 04:28:00 -0000 1.7
+++ openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl 21 Apr 2008 14:18:28 -0000 1.8
@@ -234,8 +234,16 @@
uplevel {
- set_variables_after_query
+ # inlining old set_variables_after_query
+ # TODO: improve entire audit code!
+ set set_variables_after_query_i 0
+ set set_variables_after_query_limit [ns_set size $selection]
+ while {$set_variables_after_query_i<$set_variables_after_query_limit} {
+ set [ns_set key $selection $set_variables_after_query_i] [ns_set value $selection $set_variables_after_query_i]
+ incr set_variables_after_query_i
+ }
+
# Loop through each column key and value in the selection
set selection_counter_i 0
set modification_count 0
Index: openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl 24 Feb 2005 13:33:15 -0000 1.8
+++ openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl 21 Apr 2008 14:18:29 -0000 1.9
@@ -115,27 +115,8 @@
}
}
-# ns_log debug edit-2 B category_id_list $category_id_list
-# ns_log debug edit-2 B subcategory_id_list $subcategory_id_list
-# ns_log debug edit-2 B subsubcategory_id_list $subsubcategory_id_list
-# Now deal with dates.
-# The column available_date is known to be a date.
-# Also, some of the custom fields may be dates.
-#page_validation {
- #ec_date_widget_validate available_date
-#} {
-# set date_field_identifiers [db_list custom_date_fields_select "select field_identifier from ec_custom_product_fields where column_type='date' and active_p='t'"]
- # foreach field_identifier $date_field_identifiers {
- # array set date {year ec_custom_fields($field_identifier.year) month ec_custom_fields($field_identifier.month) ec_custom_fields($field_identifier.day)}
- # ec_date_widget_validate date
- #}
-#}
-
-
-
-
# one last manipulation of data is needed: get rid of "http://" if that's all that's
# there for the url (since that was the default value)
if { [string compare $url "http://"] == 0 } {
Index: openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl 9 Mar 2004 00:59:51 -0000 1.5
+++ openacs-4/packages/ecommerce/www/admin/products/offer-add.tcl 21 Apr 2008 14:18:29 -0000 1.6
@@ -56,12 +56,9 @@
append exception_text "You have specified that only Pick Up is available, therefore you must leave the shipping price blank.\n"
}
-page_validation {
- ec_date_widget_validate offer_begins
-} {
- ec_date_widget_validate offer_ends
-}
+# TODO: validate offer_begins and offer_ends with ec_date_widget_validate or form builder
+
set offer_begins_text [ec_date_text offer_begins]
set offer_ends_text [ec_date_text offer_ends]
Index: openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl 9 Mar 2004 00:59:51 -0000 1.4
+++ openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.tcl 21 Apr 2008 14:18:29 -0000 1.5
@@ -58,12 +58,6 @@
append exception_text "You have specified that only Pick Up is available, therefore you must leave the shipping price blank.\n"
}
-page_validation {
- # ec_date_widget_validate offer_begins
-} {
- # ec_date_widget_validate offer_ends
-}
-
set offer_begins_text [ec_date_text offer_begins]
set offer_ends_text [ec_date_text offer_ends]
Index: openacs-4/packages/ecommerce/www/admin/products/review-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/review-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/products/review-add.tcl 9 Mar 2004 00:59:51 -0000 1.4
+++ openacs-4/packages/ecommerce/www/admin/products/review-add.tcl 21 Apr 2008 14:18:29 -0000 1.5
@@ -17,10 +17,6 @@
ad_require_permission [ad_conn package_id] admin
-page_validation {
-# ec_date_widget_validate review_date
-}
-
set product_name [ec_product_name $product_id]
doc_body_append "[ad_admin_header "Confirm Review of $product_name"]
Index: openacs-4/packages/ecommerce/www/admin/products/review-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/review-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/products/review-edit.tcl 10 Sep 2002 22:22:45 -0000 1.2
+++ openacs-4/packages/ecommerce/www/admin/products/review-edit.tcl 21 Apr 2008 14:18:29 -0000 1.3
@@ -6,6 +6,10 @@
@creation-date Summer 1999
@cvs-id $Id$
@author ported by Jerry Asher (jerry@theashergroup.com)
+
+ @author Mark Aufflick (mark@aufflick.com) removed unused page_validation block
+ @revision-date 22 April 2008
+
} {
product_id:integer,notnull
publication
@@ -18,9 +22,7 @@
ad_require_permission [ad_conn package_id] admin
-page_validation {
-# ec_date_widget_validate review_date
-}
+# TODO: validate review_date field
# we need them to be logged in
set user_id [ad_get_user_id]
Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl 9 Mar 2004 00:59:51 -0000 1.6
+++ openacs-4/packages/ecommerce/www/admin/products/sale-price-add.tcl 21 Apr 2008 14:18:29 -0000 1.7
@@ -40,15 +40,7 @@
}
}
-page_validation {
- # ec_date_widget_validate sale_begins
-} {
- ec_time_widget_validate sale_begins
-} {
- # ec_date_widget_validate sale_ends
-} {
- ec_time_widget_validate sale_ends
-}
+# TODO : imporve validation of sale_begins and sale_ends
if { [empty_string_p [ec_datetime_text sale_begins]] } {
ad_return_complaint 1 "You forgot to enter the time that the sale begins."
Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl 9 Mar 2004 00:59:51 -0000 1.5
+++ openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-2.tcl 21 Apr 2008 14:18:29 -0000 1.6
@@ -1,3 +1,7 @@
+
+set exception_count 0
+set exception_text ""
+
ad_page_contract {
Update a sale price.
@@ -7,6 +11,8 @@
@author ported by Jerry Asher (jerry@theashergroup.com)
@author revised by Bart Teeuwisse (bart.teeuwisse@thecodemill.biz)
@revision-date April 2002
+ @author Mark Aufflick (mark@aufflick.com) page_validation code ported to validate block
+ @revision-date 22 April 2008
} {
sale_price_id:integer,notnull
@@ -17,6 +23,21 @@
sale_ends:array,date
offer_code_needed
offer_code:optional
+} -validate {
+ sale_begins_ok {
+ set errmsg [ec_time_widget_validate sale_begins]
+ if { $errmsg ne "" } {
+ append exception_text "$errmsg.\n"
+ incr exception_count
+ }
+ }
+ sale_ends_ok {
+ set errmsg [ec_time_widget_validate sale_ends]
+ if { $errmsg ne "" } {
+ append exception_text "$errmsg.\n"
+ incr exception_count
+ }
+ }
}
ad_require_permission [ad_conn package_id] admin
@@ -26,19 +47,6 @@
return
}
-page_validation {
- # ec_date_widget_validate sale_begins
-} {
- ec_time_widget_validate sale_begins
-} {
- # ec_date_widget_validate sale_ends
-} {
- ec_time_widget_validate sale_ends
-}
-
-set exception_count 0
-set exception_text ""
-
if { $offer_code_needed == "yes_supplied" && (![info exists offer_code] || [empty_string_p $offer_code]) } {
incr exception_count
append exception_text "You forgot to specify an offer code.\n"