[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2006-07-21 13:38:42 GMT
Modified:  .        Tag: STABLE_5_4-branch WHATSNEW-5.4
Modified:  lib/Vend/Options Tag: STABLE_5_4-branch Matrix.pm
Log:
Fixed spurious hidden form element output for matrix options with separate
widgets and report option set, patch provided by Peter Ajamian.

Revision  Changes    Path
No                   revision



No                   revision



1.1.2.5   +6 -0      interchange/Attic/WHATSNEW-5.4


rev 1.1.2.5, prev_rev 1.1.2.4
Index: WHATSNEW-5.4
===================================================================
RCS file: /var/cvs/interchange/Attic/WHATSNEW-5.4,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- WHATSNEW-5.4	24 Jun 2006 16:22:08 -0000	1.1.2.4
+++ WHATSNEW-5.4	21 Jul 2006 13:38:42 -0000	1.1.2.5
@@ -19,6 +19,12 @@
   processors, rendering Interchange unresponsive for a while. Fixed by
   Kevin Walsh; pointed out by Donald Alexander.
 
+Options
+-------
+
+* Fixed spurious hidden form element output for matrix options with separate
+  widgets and report option set, patch provided by Peter Ajamian.
+
 Standard demo
 -------------
 



No                   revision



No                   revision



1.11.2.1  +8 -4      interchange/lib/Vend/Options/Matrix.pm


rev 1.11.2.1, prev_rev 1.11
Index: Matrix.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Options/Matrix.pm,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- Matrix.pm	8 Nov 2005 18:14:46 -0000	1.11
+++ Matrix.pm	21 Jul 2006 13:38:42 -0000	1.11.2.1
@@ -1,8 +1,8 @@
 # Vend::Options::Matrix - Interchange Matrix product options
 #
-# $Id: Matrix.pm,v 1.11 2005/11/08 18:14:46 jon Exp $
+# $Id: Matrix.pm,v 1.11.2.1 2006/07/21 13:38:42 racke Exp $
 #
-# Copyright (C) 2002-2005 Interchange Development Group <interchange at icdevgroup.org>
+# Copyright (C) 2002-2006 Interchange Development Group <interchange at icdevgroup.org>
 # Copyright (C) 2002-2003 Mike Heins <mikeh at perusion.net>
 
 # This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 
 package Vend::Options::Matrix;
 
-$VERSION = substr(q$Revision: 1.11 $, 10);
+$VERSION = substr(q$Revision: 1.11.2.1 $, 10);
 
 =head1 NAME
 
@@ -244,7 +244,9 @@
 		}
 		
 		$phony->{mv_sku} = $sku;
-		my $begin = Vend::Interpolate::tag_accessories(
+		my $begin = '';
+		unless ($opt->{report}) {
+			$begin = Vend::Interpolate::tag_accessories(
 							$sku,
 							'',
 							{ 
@@ -255,6 +257,8 @@
 							},
 							$phony,
 						);
+		}
+		
 		if($opt->{td}) {
 			for(@out) {
 				$out .= "<td>$begin$_</td>";