[interchange-cvs] interchange - pajamian modified 2 files

[interchange-cvs at icdevgroup.org]

User:      pajamian
Date:      2006-10-31 11:18:37 GMT
Modified:  code/UI_Tag Tag: STABLE_5_4-branch version.coretag
Modified:  .        Tag: STABLE_5_4-branch WHATSNEW-5.4
Log:
Use a path relative to the catroot instead of an absolute path to the catalog error.log file when displaying in UI Administration/Info tab.

Revision  Changes    Path
No                   revision



No                   revision



1.12.2.1  +7 -4      interchange/code/UI_Tag/version.coretag


rev 1.12.2.1, prev_rev 1.12
Index: version.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/version.coretag,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- version.coretag	8 Nov 2005 18:14:40 -0000	1.12
+++ version.coretag	31 Oct 2006 11:18:37 -0000	1.12.2.1
@@ -1,13 +1,13 @@
 # Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: version.coretag,v 1.12 2005/11/08 18:14:40 jon Exp $
+# $Id: version.coretag,v 1.12.2.1 2006/10/31 11:18:37 pajamian Exp $
 
 UserTag version Order      extended
 UserTag version attrAlias  module_test modtest
 UserTag version attrAlias  moduletest modtest
 UserTag version attrAlias  require modtest
 UserTag version addAttr
-UserTag version Version    $Revision: 1.12 $
+UserTag version Version    $Revision: 1.12.2.1 $
 UserTag version Routine    <<EOR
 sub {
 	return $::VERSION unless shift;
@@ -22,8 +22,11 @@
 	}
 
 	if($opt->{local_error}) {
-		my $fn = $Vend::Cfg->{ErrorFile};
-		push @out, $Tag->page("$::Variable->{UI_BASE}/do_view", $fn) . "$fn</a>";
+		my $dfn = my $fn = $Vend::Cfg->{ErrorFile};
+		my $pre = $Global::Catalog{$Vend::Cat}->{dir} . '/';
+		$fn =~ s:^\Q$pre\E::;
+		my $href = $Tag->area("$::Variable->{UI_BASE}/do_view", $fn);
+		push(@out, qq{<a href="$href">$dfn</a>});
 		$done_something = 1;
 	}
 



No                   revision



No                   revision



1.1.2.10  +3 -0      interchange/Attic/WHATSNEW-5.4


rev 1.1.2.10, prev_rev 1.1.2.9
Index: WHATSNEW-5.4
===================================================================
RCS file: /var/cvs/interchange/Attic/WHATSNEW-5.4,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- WHATSNEW-5.4	9 Oct 2006 08:51:26 -0000	1.1.2.9
+++ WHATSNEW-5.4	31 Oct 2006 11:18:37 -0000	1.1.2.10
@@ -39,6 +39,9 @@
   page when using source mode for display. Don't filter entities when 
   using HTML mode for display.
 
+* Use a path relative to the catroot instead of an absolute path to the
+  catalog error.log file when displaying in the UI Administration/Info tab.
+
 Standard demo
 -------------