[interchange-cvs] interchange - jon modified lib/Vend/Table/Editor.pm

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2006-04-05 17:40:39 GMT
Modified:  lib/Vend/Table Editor.pm
Log:
Correct display of "Are you sure you want to delete $SKU" dialog when
multi-part primary keys are used.

Problem found and fixed by Jeff Boes <jeff at endpoint.com>. Thanks!

Revision  Changes    Path
1.83      +6 -5      interchange/lib/Vend/Table/Editor.pm


rev 1.83, prev_rev 1.82
Index: Editor.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Table/Editor.pm,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -u -r1.82 -r1.83
--- Editor.pm	30 Jan 2006 17:50:03 -0000	1.82
+++ Editor.pm	5 Apr 2006 17:40:38 -0000	1.83
@@ -1,6 +1,6 @@
 # Vend::Table::Editor - Swiss-army-knife table editor for Interchange
 #
-# $Id: Editor.pm,v 1.82 2006/01/30 17:50:03 jon Exp $
+# $Id: Editor.pm,v 1.83 2006/04/05 17:40:38 jon Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Table::Editor;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.82 $, 10);
+$VERSION = substr(q$Revision: 1.83 $, 10);
 
 use Vend::Util;
 use Vend::Interpolate;
@@ -4145,6 +4145,7 @@
 
 
 	if($exists and ! $opt->{nodelete} and $Tag->if_mm('tables', "$table=d")) {
+		my $key_display = join '/', split /\0/, $key;
 		my $extra = $Tag->return_to( { type => 'click', tablehack => 1 });
 		my $page = $CGI->{ui_return_to};
 		$page =~ s/\0.*//s;
@@ -4160,20 +4161,20 @@
 					!,
 					});
 		my $delstr = errmsg('Delete');
-		my $delmsg = errmsg('Are you sure you want to delete %s?',$key);
+		my $delmsg = errmsg('Are you sure you want to delete %s?', $key_display);
 		if($opt->{output_map} or $opt->{button_delete}) {
 			chunk 'DELETE_BUTTON', 'NOSAVE OUTPUT_MAP', <<EOF;
 &nbsp;
 	<input
 		type=button
 		onClick="if(confirm('$delmsg')) { location='$url' }"
-		title="Delete $key"
+		title="Delete $key_display"
 		value="$delstr"$opt->{delete_button_extra}>
 EOF
 		}
 		else {
 			chunk 'DELETE_BUTTON', 'NOSAVE OUTPUT_MAP', <<EOF; # if ! $opt->{nosave};
-<br><br><a onClick="return confirm('$delmsg')" href="$url"><img src="delete.gif" alt="Delete $key" border="0"></a> $delstr
+<br><br><a onClick="return confirm('$delmsg')" href="$url"><img src="delete.gif" alt="Delete $key_display" border="0"></a> $delstr
 EOF
 		}