Author: sshyrkov Date: Mon Jun 11 12:42:44 2007 New Revision: 17541 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17541&repname= =3Djahia Log: JAHIA-1993: SP2: FCK - link on file has no proper resolution of jahia servl= et name and context (replace by ###) =
http://www.jahia.net/jira/browse/JAHIA-1993 Resolved: check added for linked WebDAV resources Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaB= igTextField.java Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/= JahiaBigTextField.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/data/fields/JahiaBigTextField.java&rev=3D17= 541&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaB= igTextField.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaB= igTextField.java Mon Jun 11 12:42:44 2007 @@ -506,6 +506,21 @@ } } = + // Check if the URL is a Jahia WebDAV URL + if (link.startsWith(processingContext.getContextPath() + + "/webdav/")) { + if (logger.isDebugEnabled()) + logger.debug("Link to WebDAV resource found: " + l= ink); + rawResult.append("href=3D\"").append(URL_MARKER).appen= d( + link.substring(processingContext.getContextPat= h() + .length())).append("\""); + if (rest !=3D null) + rawResult.append(">").append(rest); + rawResult.append(delimiter); + displayResult.append(token).append(delimiter); + continue; + } + = // Check if the URL is a Jahia URL... int pid =3D -1; String urlKey =3D null; _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
