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

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-07-21 21:18:52 GMT
Modified:  lib/Vend/Table Editor.pm
Log:
* Fix longstanding bug where $base_entry_value was not showing the proper
  columns (with a columns:: spec) in the meta editor.

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


rev 1.62, prev_rev 1.61
Index: Editor.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Table/Editor.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Editor.pm	21 Jul 2004 05:46:55 -0000	1.61
+++ Editor.pm	21 Jul 2004 21:18:52 -0000	1.62
@@ -1,6 +1,6 @@
 # Vend::Table::Editor - Swiss-army-knife table editor for Interchange
 #
-# $Id: Editor.pm,v 1.61 2004/07/21 05:46:55 mheins Exp $
+# $Id: Editor.pm,v 1.62 2004/07/21 21:18:52 mheins Exp $
 #
 # Copyright (C) 2002-2003 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.61 $, 10);
+$VERSION = substr(q$Revision: 1.62 $, 10);
 
 use Vend::Util;
 use Vend::Interpolate;
@@ -289,15 +289,15 @@
 		my $view = $opt->{view} || $opt->{arbitrary};
 
 		## This is intended to trigger on the first access
-		if($column eq $meta->config('KEY')) {
+		if($table eq $mtab and $column eq $meta->config('KEY')) {
 			if($view and $opt->{value} !~ /::.+::/) {
 				$base_entry_value = ($opt->{value} =~ /^([^:]+)::(\w+)$/)
 									? $1
 									: $opt->{value};
 			}
 			else {
-				$base_entry_value = $opt->{value} =~ /::/
-									? $table
+				$base_entry_value = $opt->{value} =~ /(\w+)::/
+									? $1
 									: $opt->{value};
 			}
 		}