[interchange-cvs] interchange - thunder modified 2 files

[interchange-cvs at icdevgroup.org]

User:      thunder
Date:      2008-04-24 09:07:57 GMT
Modified:  dist/lib/UI ContentEditor.pm
Modified:  dist/lib/UI/pages/admin content_publish.html
Log:
fixing bug with component cloning via the admin, see user mailinglist September 2005 for more details

Revision  Changes    Path
2.22                 interchange/dist/lib/UI/ContentEditor.pm


rev 2.22, prev_rev 2.21
Index: ContentEditor.pm
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/ContentEditor.pm,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -r2.21 -r2.22
--- ContentEditor.pm	9 Aug 2007 13:40:52 -0000	2.21
+++ ContentEditor.pm	24 Apr 2008 09:07:57 -0000	2.22
@@ -1,6 +1,6 @@
 # UI::ContentEditor - Interchange page/component edit
 # 
-# $Id: ContentEditor.pm,v 2.21 2007-08-09 13:40:52 pajamian Exp $
+# $Id: ContentEditor.pm,v 2.22 2008-04-24 09:07:57 thunder Exp $
 #
 # Copyright (C) 2002-2007 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -22,7 +22,7 @@
 
 package UI::ContentEditor;
 
-$VERSION = substr(q$Revision: 2.21 $, 10);
+$VERSION = substr(q$Revision: 2.22 $, 10);
 $DEBUG = 0;
 
 use POSIX qw/strftime/;
@@ -2836,6 +2836,12 @@
 	my $ref = get_store($type,$name)
 		or return death('content_modify', "%s %s not found", $type, $name);
 
+       #in case of an alternative component name
+       if ($vref->{ui_destination} ne "") {
+           $name = $ref->{ui_name} = $vref->{ui_destination};
+       }
+
+
 	foreach my $op (@ops) {
 #::logDebug("content_modify: doing name=$name type=$type op=$op");
 #::logDebug("content_modify: doing name=$name type=$type op=$op ref=" . uneval($ref));



1.3                  interchange/dist/lib/UI/pages/admin/content_publish.html


rev 1.3, prev_rev 1.2
Index: content_publish.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/content_publish.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- content_publish.html	13 Sep 2002 20:46:20 -0000	1.2
+++ content_publish.html	24 Apr 2008 09:07:57 -0000	1.3
@@ -52,7 +52,12 @@
 
 [if cgi ui_content_op]
 	[if type=explicit compare="[content-modify]"]
-		[warnings message="Published [cgi ui_type] [cgi ui_name]."]
+		[if cgi ui_destination ne ""]
+			[warnings message="Published [cgi ui_type] [cgi ui_destination]."]
+		[else]
+			[warnings message="Published [cgi ui_type] [cgi ui_name]."]
+		[/else]
+		[/if]
 	[/if]
 	[bounce page=__UI_BASE__/content]
 [/if]