[interchange-cvs] interchange - heins modified 2 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Fri Dec 13 07:54:00 2002
User: heins
Date: 2002-12-13 12:53:23 GMT
Modified: lib/Vend/Table Editor.pm
Modified: dist/foundation/products mv_metadata.asc
Log:
* Get restrict_allow settings right -- the default was not allowing the "var"
to be expanded in the image preview path. Should probably look at this
concept on a per-field basis, and set the default to "".
Fixes Bugzilla #475, reported by as@freibergnet.de.
Revision Changes Path
1.21 +4 -3 interchange/lib/Vend/Table/Editor.pm
rev 1.21, prev_rev 1.20
Index: Editor.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Table/Editor.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Editor.pm 23 Nov 2002 03:59:43 -0000 1.20
+++ Editor.pm 13 Dec 2002 12:53:22 -0000 1.21
@@ -1,6 +1,6 @@
# Vend::Table::Editor - Swiss-army-knife table editor for Interchange
#
-# $Id: Editor.pm,v 1.20 2002/11/23 03:59:43 mheins Exp $
+# $Id: Editor.pm,v 1.21 2002/12/13 12:53:22 mheins Exp $
#
# Copyright (C) 2002 ICDEVGROUP <interchange@icdevgroup.org>
# Copyright (C) 2002 Mike Heins <mike@perusion.net>
@@ -26,7 +26,7 @@
package Vend::Table::Editor;
use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.20 $, 10);
+$VERSION = substr(q$Revision: 1.21 $, 10);
use Vend::Util;
use Vend::Interpolate;
@@ -932,7 +932,7 @@
my %o_default_defined = (
mv_update_empty => 1,
- restrict_allow => 'page area',
+ restrict_allow => 'page area var cgi',
);
my %o_default = (
@@ -1193,6 +1193,7 @@
panel_height
panel_id
panel_width
+ restrict_allow
spacer_row_class
spacer_row_style
spacer_height
2.26 +1 -1 interchange/dist/foundation/products/mv_metadata.asc
rev 2.26, prev_rev 2.25
Index: mv_metadata.asc
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/mv_metadata.asc,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -r2.25 -r2.26
--- mv_metadata.asc 13 Dec 2002 03:19:38 -0000 2.25
+++ mv_metadata.asc 13 Dec 2002 12:53:23 -0000 2.26
@@ -175,7 +175,7 @@
pricing text Pricing Settings 2
pricing::price_group combo pricing Discount group price_group nullselect
pricing::q3 text
-products text 50 Product information Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn {'bottom_buttons' => "",'tab_vert_offset' => "",'spread_textarea' => "",'include_form_expand' => "",'restrict_allow' => "area",'widget_cell_class' => "cwidget",'ui_sort_field' => "",'link_table' => "",'ui_show_fields' => "sku
description(30.)
prod_group
category
price(%.2f align=right)",'link_extra' => "",'break_row_class' => "rmarq",'label_cell_class' => "clabel",'tab_horiz_offset' => "",'link_before' => "",'ui_special_add' => "Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn",'left_width' => "20%",'top_buttons' => "",'include_before' => "",'combo_row_class' => "rnorm",'spread_fields' => "sku
description
price
comment
nontaxable",'ui_meta_specific' => "",'tab_height' => "",'link_view' => "",'link_fields' => "",'spread_meta' => "comment nontaxable",'data_row_class' => "rnorm",'tab_width' => "120",'ui_sort_option' => "",'panel_height' => "700",'include_form' => "",'help_cell_class' => "chelp",'spacer_row_class' => "rspacer",'ui_sort_combined' => "",'ui_data_fields' => "=General
sku
description
prod_group
category
comment
=Pricing
price
wholesale
=Images
image
thumb
image_large
=Shipping/Tax/Other
weight
gift_cert
nontaxable",'file_upload' => "1",'spread_width' => "8",'tabbed' => "1",'spread_height' => "25",'include_form_interpolate' => "",'table_width' => "800",'spread_textarea_rows' => "4",'link_sort' => "",'panel_width' => "800",'link_key' => "",'data_cell_class' => "cdata",'view_from' => "",'link_label' => "",}
+products text 50 Product information Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn {'bottom_buttons' => "",'tab_vert_offset' => "",'spread_textarea' => "",'include_form_expand' => "",'restrict_allow' => "area var page cgi",'widget_cell_class' => "cwidget",'ui_sort_field' => "",'link_table' => "",'ui_show_fields' => "sku
description(30.)
prod_group
category
price(%.2f align=right)",'link_extra' => "",'break_row_class' => "rmarq",'label_cell_class' => "clabel",'tab_horiz_offset' => "",'link_before' => "",'ui_special_add' => "Qty price;pricing:q5:rn,Options;options:o_enable:r,Promo;merchandising:featured:r,Inventory;inventory:quantity:rn",'left_width' => "20%",'top_buttons' => "",'include_before' => "",'combo_row_class' => "rnorm",'spread_fields' => "sku
description
price
comment
nontaxable",'ui_meta_specific' => "",'tab_height' => "",'link_view' => "",'link_fields' => "",'spread_meta' => "comment nontaxable",'data_row_class' => "rnorm",'tab_width' => "120",'ui_sort_option' => "",'panel_height' => "700",'include_form' => "",'help_cell_class' => "chelp",'spacer_row_class' => "rspacer",'ui_sort_combined' => "",'ui_data_fields' => "=General
sku
description
prod_group
category
comment
=Pricing
price
wholesale
=Images
image
thumb
image_large
=Shipping/Tax/Other
weight
gift_cert
nontaxable",'file_upload' => "1",'spread_width' => "8",'tabbed' => "1",'spread_height' => "25",'include_form_interpolate' => "",'table_width' => "800",'spread_textarea_rows' => "4",'link_sort' => "",'panel_width' => "800",'link_key' => "",'data_cell_class' => "cdata",'view_from' => "",'link_label' => "",}
products::artist text 30 Artist
products::category combo 20 1 products Category Enter in box for new category. category nullselect nullselect
products::color textarea 70 2