[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_3-8-g99154be
Jon Jensen
interchange-cvs at icdevgroup.org
Tue Nov 10 23:57:19 UTC 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".
The branch, master has been updated
via 99154be99c74ca402fbd063aca09e94de8e77535 (commit)
via 1ac8849e7be5f9c2ffb5da20d3bd18329dbbe3f2 (commit)
from dd9d926110ba3670a7260df100793a543da5f487 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 99154be99c74ca402fbd063aca09e94de8e77535
Author: Jon Jensen <jon at endpoint.com>
Date: Tue Nov 10 16:54:33 2009 -0700
Remove use of nonexistent variables for customers & items (RT #321)
These changes were inadvertently pulled over from orders code
in commit 432924ade348d37a97732326b6a2532de789069d
but orders have a status field and use $Values->{checked_status}
and customers & items don't.
commit 1ac8849e7be5f9c2ffb5da20d3bd18329dbbe3f2
Author: Jon Jensen <jon at endpoint.com>
Date: Tue Nov 10 16:54:14 2009 -0700
Use calcn where appropriate, and remove some JavaScript debug comments
-----------------------------------------------------------------------
Summary of changes and diff:
dist/lib/UI/pages/admin/customer.html | 26 +++++++++++---------------
dist/lib/UI/pages/admin/item.html | 30 +++++++++++++-----------------
2 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/dist/lib/UI/pages/admin/customer.html b/dist/lib/UI/pages/admin/customer.html
index 67e5242..f6296df 100644
--- a/dist/lib/UI/pages/admin/customer.html
+++ b/dist/lib/UI/pages/admin/customer.html
@@ -1,4 +1,4 @@
- at _UI_STD_INIT_@[calc]
+ at _UI_STD_INIT_@[calcn]
if ( $CGI->{showactive} ) {
delete $Values->{showinactive};
$Values->{showactive} = 1;
@@ -21,7 +21,7 @@
$Scratch->{active_nm} = 'deactivate';
}
return;
-[/calc]
+[/calcn]
[value name=mv_data_table set=userdb hide=1]
[if-mm !tables]
@@ -130,7 +130,7 @@
return;
[/perl]
-[calc]
+[calcn]
if ($CGI->{mv_like_spec}) {
my @f = split /\0/, $CGI->{mv_like_field};
my @s = split /\0/, $CGI->{mv_like_spec};
@@ -160,7 +160,7 @@
},
);
return;
-[/calc]
+[/calcn]
[if scratch ui_location]
[bounce href=`delete $Scratch->{ui_location}`]
@@ -196,13 +196,13 @@
<!-- ----- Show the customer list box ----- -->
[if cgi ui_text_qualification]
-[calc]
+[calcn]
return if $CGI->{mv_like_spec};
$Scratch->{page_banner} ||= $Scratch->{page_title};
my $val = $Tag->filter('encode_entities', $CGI->{ui_text_qualification});
$Scratch->{page_banner} .= ' -- ' . errmsg( 'entries containing "%s"', $val);
return;
-[/calc]
+[/calcn]
[/if]
<FORM ACTION="[process]">
[form-session-id]
@@ -235,7 +235,7 @@
[scratch start_at][set start_at][/set]
rf=username,company,lname,fname,city,state,country
"]
-[calc]
+[calcn]
my $so = $CGI->{ui_sort_option};
my $fld = $CGI->{ui_sort_field};
$fld =~ s/[\s,\0].*//;
@@ -248,7 +248,7 @@
return $out . 'r';
}
return;
-[/calc]
+[/calcn]
<br>
<table width="100%" border=0 cellpadding=0 cellspacing=1 class=rseparator>
<tr class=rhead>
@@ -282,11 +282,9 @@
my $string = '';
if(! $Scratch->{old_browser}) {
my $nm = 'checker[item-increment]';
- push @els, qq{push_el('$nm', '[item-param status]');};
+ push @els, qq{push_el('$nm', '');};
$string .= "id=$nm ";
}
- return $string if $Scratch->{archive_nm} eq 'unarchive';
- $string .= 'CHECKED' if q{[item-param status]} eq $Values->{checked_status};
return $string;
[/item-calc]
>
@@ -399,7 +397,6 @@ so there's a full line across the page even if table cells are blank.
function push_el (el, status) {
if(stat_array[status] == undefined) {
stat_array[status] = new Array;
-// alert('created ' + status + ' array');
}
var els = stat_array[status];
els[els.length] = el;
@@ -417,7 +414,6 @@ so there's a full line across the page even if table cells are blank.
var i;
var alerted;
for(i in stat_array) {
-// alert("checking status of " + i);
var els = stat_array[i];
for (var j = 0; j < els.length; j++) {
var el = document.getElementById(els[j]);
@@ -449,9 +445,9 @@ so there's a full line across the page even if table cells are blank.
img.src= image_dir + 'box_checked.gif';
}
}
- [calc]
+ [calcn]
return join "\n", @els, '';
- [/calc]
+ [/calcn]
</script>
<A HREF="javascript:checkType('all')"><img id="img_check_all" src="__UI_IMG__box_empty.gif" border=0>[L]Check all[/L]</A>
diff --git a/dist/lib/UI/pages/admin/item.html b/dist/lib/UI/pages/admin/item.html
index d123562..7628ae7 100644
--- a/dist/lib/UI/pages/admin/item.html
+++ b/dist/lib/UI/pages/admin/item.html
@@ -1,9 +1,9 @@
[if !cgi mv_data_table]
[or cgi ui_scrub_table]
-[calc]
+[calcn]
$CGI->{mv_data_table} = $Values->{mv_data_table} = $Config->{ProductFiles}[0];
return;
-[/calc]
+[/calcn]
[/if]
[if cgi mv_data_table eq 'mv_metadata']
[cgi name=mv_data_table set=__ProductFiles_0__ hide=1]
@@ -238,12 +238,12 @@ EOF
[/perl]
[if scratch ui_text_qualification]
-[calc]
+[calcn]
return if $CGI->{mv_like_spec};
$Scratch->{page_banner} ||= $Scratch->{page_title};
$Scratch->{page_banner} .= ' -- ' . $Scratch->{ui_text_qualification};
return;
-[/calc]
+[/calcn]
[/if]
<!-- existing item_sparams: '[scratch item_sparams]'
@@ -292,7 +292,7 @@ EOF
[/if]
[search-region more=1 sort="[scratch item_special_sort]" arg="[scratch item_sparams]"]
-[calc]
+[calcn]
my $so = $CGI->{ui_sort_option};
my $fld = $CGI->{ui_sort_field};
$fld =~ s/[\s,\0].*//;
@@ -305,7 +305,7 @@ EOF
return $out . 'r';
}
return;
-[/calc]
+[/calcn]
<FORM ACTION="[area __UI_BASE__/item_edit]" METHOD=POST>
[form-session-id]
@@ -355,7 +355,7 @@ EOF
</table>
</th>
[/loop]
-[calc]
+[calcn]
my $out = '';
for(@special) {
my $display = $_;
@@ -396,7 +396,7 @@ EOF
EOF
}
return $out;
-[/calc]
+[/calcn]
</tr>
[search-list]
<tr class=[item-alternate 2]rowalt[else]rownorm[/else][/item-alternate]>
@@ -406,11 +406,9 @@ EOF
my $string = '';
if(! $Scratch->{old_browser}) {
my $nm = 'checker[item-increment]';
- push @els, qq{push_el('$nm', '[item-param status]');};
+ push @els, qq{push_el('$nm', '');};
$string .= "id=$nm ";
}
- return $string if $Scratch->{archive_nm} eq 'unarchive';
- $string .= 'CHECKED' if q{[item-param status]} eq $Values->{checked_status};
return $string;
[/item-calc]
></TD><TD>[page href=__UI_BASE__/item_edit form="item_id=[item-code]"][item-code]</A></TD>
@@ -522,7 +520,7 @@ Inventory
[output name="bottom_buttons"]
[button text="[L]Edit checked items in sequence[/L]" extra="class=s3"]
-ui_sequence_edit=[calc]
+ui_sequence_edit=[calcn]
$CGI->{item_id_left} = $CGI->{item_id};
$CGI->{item_id_left} =~ s/\0+/,/g;
if($CGI->{item_id_left} =~ s/^(.*?),//) {
@@ -533,7 +531,7 @@ ui_sequence_edit=[calc]
delete $CGI->{item_id_left};
return '';
}
-[/calc]
+[/calcn]
mv_nextpage=__UI_BASE__/item_edit
mv_todo=return
[/button]
@@ -561,7 +559,6 @@ mv_nextpage=@@MV_PAGE@@
function push_el (el, status) {
if(stat_array[status] == undefined) {
stat_array[status] = new Array;
-// alert('created ' + status + ' array');
}
var els = stat_array[status];
els[els.length] = el;
@@ -579,7 +576,6 @@ mv_nextpage=@@MV_PAGE@@
var i;
var alerted;
for(i in stat_array) {
-// alert("checking status of " + i);
var els = stat_array[i];
for (var j = 0; j < els.length; j++) {
var el = document.getElementById(els[j]);
@@ -611,9 +607,9 @@ mv_nextpage=@@MV_PAGE@@
img.src= image_dir + 'box_checked.gif';
}
}
- [calc]
+ [calcn]
return join "\n", @els, '';
- [/calc]
+ [/calcn]
</script>
<br/>
<A HREF="javascript:checkType('all')"><img id="img_check_all" src="__UI_IMG__box_empty.gif" border=0>[L]Check all[/L]</A>
hooks/post-receive
--
Interchange
More information about the interchange-cvs
mailing list