[interchange-cvs] interchange - heins modified 3 files
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Tue Feb 5 00:33:00 2002
User: heins
Date: 2002-02-05 05:32:13 GMT
Modified: dist/lib/UI/pages/admin db_metaconfig.html
Modified: db_metaconfig_select.html item.html
Log:
* Create new view specifically for item_editor
* Fix item editor to have special add be editable again
* Add ui_special_add to new extended DB edit pages.
* Fix a couple of minor item.html bugs.
Revision Changes Path
2.2 +22 -0 interchange/dist/lib/UI/pages/admin/db_metaconfig.html
rev 2.2, prev_rev 2.1
Index: db_metaconfig.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/db_metaconfig.html,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- db_metaconfig.html 9 Oct 2001 22:32:52 -0000 2.1
+++ db_metaconfig.html 5 Feb 2002 05:32:13 -0000 2.2
@@ -63,6 +63,7 @@
height
extended.ui_sort_field
extended.ui_show_fields
+ extended.ui_special_add
=Edit page display
@@ -87,6 +88,7 @@
height => 'Rows on select page',
'extended.ui_sort_field' => 'Sort by on select page',
'extended.ui_show_fields' => 'Show on select page',
+ 'extended.ui_special_add' => 'Special Additions',
'extended.ui_data_fields' => 'Fields to edit',
'extended.spread_fields' => 'Fields to edit',
'extended.spread_height' => 'Number of rows',
@@ -96,6 +98,10 @@
'extended.table_width' => 'Width specification for editor table',
}`
+ help=`{
+ 'extended.ui_special_add' => 'Only applies to certain pages (Items uses this)',
+ }`
+
widget=`{
code => 'text_40',
name => 'text_40',
@@ -109,6 +115,11 @@
'extended.spread_textarea_rows' => 'text_5',
}`
+ filter=`{
+ height => 'digits',
+ 'extended.ui_special_add' => 'null_to_comma',
+ }`
+
database=`{
'extended.ui_sort_field' => $CGI->{ui_table},
'extended.ui_show_fields' => $CGI->{ui_table},
@@ -123,11 +134,22 @@
'extended.spread_fields' => 8,
}`
+ width=`{
+ 'extended.ui_show_fields' => 30,
+ }`
+
options=`{
'extended.ui_sort_field' => 'columns',
'extended.ui_show_fields' => 'columns',
'extended.ui_data_fields' => 'columns',
'extended.spread_fields' => 'columns',
+ 'extended.ui_special_add' => q{NONE,
+Qty price;pricing:q5:rn=Qty price,
+Options;options:o_enable:r=Options,
+Up-sell;merchandising:upsell_to:r=Up-sell,
+Cross-sell;merchandising:cross_sell:r=Cross-sell,
+Promo;merchandising:featured:r=Promo,
+Inventory;inventory:quantity:rn=Inventory},
}`
]
2.2 +23 -0 interchange/dist/lib/UI/pages/admin/db_metaconfig_select.html
rev 2.2, prev_rev 2.1
Index: db_metaconfig_select.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/db_metaconfig_select.html,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- db_metaconfig_select.html 9 Oct 2001 22:32:52 -0000 2.1
+++ db_metaconfig_select.html 5 Feb 2002 05:32:13 -0000 2.2
@@ -63,6 +63,7 @@
height
extended.ui_sort_field
extended.ui_show_fields
+ extended.ui_special_add
"
@@ -72,6 +73,7 @@
height => 'Rows on select page',
'extended.ui_sort_field' => 'Sort by on select page',
'extended.ui_show_fields' => 'Show on select page',
+ 'extended.ui_special_add' => 'Special Additions',
}`
widget=`{
@@ -80,6 +82,12 @@
height => 'text_5',
'extended.ui_sort_field' => 'select',
'extended.ui_show_fields' => 'move_combo_8',
+ 'extended.ui_special_add' => 'multiple',
+ }`
+
+ filter=`{
+ height => 'digits',
+ 'extended.ui_special_add' => 'null_to_comma',
}`
database=`{
@@ -87,14 +95,29 @@
'extended.ui_show_fields' => $CGI->{ui_table},
}`
+ help=`{
+ 'extended.ui_special_add' => 'Only applies to certain pages (Items uses this)',
+ }`
+
height=`{
'extended.ui_sort_field' => 8,
'extended.ui_show_fields' => 8,
}`
+ width=`{
+ 'extended.ui_show_fields' => 30,
+ }`
+
options=`{
'extended.ui_sort_field' => 'columns',
'extended.ui_show_fields' => 'columns',
+ 'extended.ui_special_add' => q{NONE,
+Qty price;pricing:q5:rn=Qty price,
+Options;options:o_enable:r=Options,
+Up-sell;merchandising:upsell_to:r=Up-sell,
+Cross-sell;merchandising:cross_sell:r=Cross-sell,
+Promo;merchandising:featured:r=Promo,
+Inventory;inventory:quantity:rn=Inventory},
}`
]
2.8 +14 -15 interchange/dist/lib/UI/pages/admin/item.html
rev 2.8, prev_rev 2.7
Index: item.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/item.html,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- item.html 4 Feb 2002 23:35:37 -0000 2.7
+++ item.html 5 Feb 2002 05:32:13 -0000 2.8
@@ -8,17 +8,14 @@
[set ui_class]Items[/set]
[tmp page_title][L]Item editor[/L][/tmp]
[if-mm super]
-[tmp page_banner][page href="__UI_BASE__/flex_editor"
- form='
- mv_data_table=__UI_META_TABLE__
- ui_meta_view=dbconfig
- ui_data_fields=code name height extended.ui_show_fields extended.ui_sort_field extended.ui_select_add extended.ui_data_fields help help_url extended.ui_backup_select
- ui_break_before=height help extended.ui_backup_select
- page_title=[L]Change display information[/L]: [cgi mv_data_table]
- ui_return_to=__UI_BASE__/item
- ui_return_to=ui_scrub_table=1
- item_id=[cgi mv_data_table]
- '][L]Item editor[/L]</A>
+[tmp page_banner]
+ [page href="__UI_BASE__/db_metaconfig_select"
+ secure="[scratch page_secure]"
+ form='
+ ui_return_to=__UI_BASE__/index
+ ui_view=item_select
+ ui_table=[cgi mv_data_table]
+ '][L]Item editor[/L]</A>
[/tmp]
[/if-mm]
[set table_perm]__ProductFiles_0__=v[/set]
@@ -117,7 +114,7 @@
[perl tables="[cgi mv_data_table] __UI_META_TABLE__"]
my $tab = $CGI->{mv_data_table};
- my $view = $CGI->{ui_meta_view};
+ my $view = $CGI->{ui_meta_view} || 'item_select';
my $ref = $Db{$tab};
my $meta = $Tag->meta_record($tab, $view);
#Debug("Meta record: " . uneval($meta));
@@ -246,6 +243,8 @@
$CGI->{ui_show_fields} =~
s/(\w+)(?:\((.*?)\))?/ ($filter_show[$i++] = $2), $1/eg;
#Debug("filter_show: " . $Tag->uneval( { ref => \@filter_show } ));
+ $CGI->{ui_show_fields} =~ s/[\0,\s]+$//g;
+ $CGI->{ui_show_fields} =~ s/^[\0,\s]+//g;
$CGI->{ui_show_fields} =~ s/[\0,\s]+/,/g;
$CGI->{ui_description_fields} = $CGI->{ui_show_fields};
}
@@ -266,7 +265,7 @@
@special = grep $_ !~ /^none$/i, @special;
$Scratch->{ui_show_special} = join ("\n", '', @special, '');
- @cols = split /[\s,\0]+/, $CGI->{ui_description_fields};
+ @cols = grep /\S/, split /[\s,\0]+/, $CGI->{ui_description_fields};
for(@cols) {
$numeric{$_} = 1 if $ref->numeric($_);
}
@@ -349,7 +348,7 @@
return $extra || ' ALIGN=LEFT';
[/loop-calc]>
- <table align="center">
+ <table align="left">
<tr>
<td align="right" valign="center">
<A HREF="[area
@@ -377,7 +376,7 @@
ui_sort_option=$o
);
`
- ]" class=ctitle>[either][data table="__UI_META_TABLE__" column=label key="[cgi mv_data_table]::[loop-code]"][or][loop-code][/either]
+ ]" class=ctitle>[either][data table="__UI_META_TABLE__" column=label key="[cgi mv_data_table]::[loop-code]"][or][loop-code][/either]</A>
</td>
</tr>
</table>