Author: knguyen
Date: Wed May 30 17:02:25 2007
New Revision: 686
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D686&repname=
=3Dcorporate_portal_templates_v2
Log:
SIACG-8: fix file url with quote character.
Modified:
branches/JAHIA-ACG-BRANCH/src/jsp/advsearch/detailed_search_result_list=
.inc
branches/JAHIA-ACG-BRANCH/src/jsp/box/savedsearch.inc
branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/advsearch/detailed_search_resul=
t_list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/advsearch/detailed_search_result_list.inc&rev=3D686&repname=3D=
corporate_portal_templates_v2
=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-ACG-BRANCH/src/jsp/advsearch/detailed_search_result_list=
.inc (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/advsearch/detailed_search_result_list=
.inc Wed May 30 17:02:25 2007
@@ -99,9 +99,9 @@
<% } else { %>
<% if ( dfa !=3D null && jff !=3D null ){ %>
<display:column title=3D''>
- <a href=3D'<%=3Djff.getDownloadUrl()%>' folder=3D'<%=3D request.=
getScheme() + "://" +
+ <a href=3D'<%=3DJahiaTools.replacePattern(org.jahia.engines.file=
manager.TableEntry.javascriptDecode(jff.getDownloadUrl()),"'","'")%>' f=
older=3D'<%=3D request.getScheme() + "://" +
request.getServerName() + (request.getServerPort()!=3D80?":" + =
request.getServerPort():"") +
- org.jahia.engines.filemanager.TableEntry.javascriptDecode(jff.g=
etDownloadUrl().substring(0, jff.getDownloadUrl().lastIndexOf("/"))) %>' st=
yle=3D"behavior:url(#default#AnchorClick);margin-right:0px!important;paddin=
g-right:0px!important;"
+ JahiaTools.replacePattern(org.jahia.engines.filemanager.TableEn=
try.javascriptDecode(jff.getDownloadUrl().substring(0, jff.getDownloadUrl()=
.lastIndexOf("/"))),"'","'") %>' style=3D"behavior:url(#default#AnchorC=
lick);margin-right:0px!important;padding-right:0px!important;"
target=3D"_blank"><img title=3D"Open in IE folder" alt=3D"IE Fol=
der" border=3D"0" src=3D"<content:serverHttpPath/>/jsp/jahia/javascript/zim=
bra/complexTree/IEFolder.gif" /></a>
</display:column>
<% }
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/box/savedsearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/box/savedsearch.inc&rev=3D686&repname=3Dcorporate_portal_templ=
ates_v2
=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-ACG-BRANCH/src/jsp/box/savedsearch.inc (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/box/savedsearch.inc Wed May 30 17:02:=
25 2007
@@ -229,7 +229,7 @@
<a href=3D'<%=3Djff.getDownloadUrl()%>' =
folder=3D'<%=3D request.getScheme() + "://" +
request.getServerName() + (request.=
getServerPort()!=3D80?":" + request.getServerPort():"") +
request.getContextPath() + "/webdav=
/site/" +
- org.jahia.engines.filemanager.Table=
Entry.javascriptDecode(jff.getDownloadUrl().substring(0, jff.getDownloadUrl=
().lastIndexOf("/"))) %>' style=3D"behavior:url(#default#AnchorClick);margi=
n-right:0px!important;padding-right:0px!important;"
+ JahiaTools.replacePattern(org.jahia=
.engines.filemanager.TableEntry.javascriptDecode(jff.getDownloadUrl().subst=
ring(0, jff.getDownloadUrl().lastIndexOf("/"))),"'","'") %>' style=3D"b=
ehavior:url(#default#AnchorClick);margin-right:0px!important;padding-right:=
0px!important;"
target=3D"_blank"><img title=3D"Open =
in IE folder" alt=3D"IE Folder" border=3D"0" src=3D"<content:serverHttpPath=
/>/jsp/jahia/javascript/zimbra/complexTree/IEFolder.gif" /></a>
<% } else { %>
<a style=3D"margin-right:0px!important;p=
adding-right:0px!important;" target=3D"_new" href=3D"<%=3DfolderPathDAV.get=
FullPath(jParams)%>"><%=3DfolderPathDAV.getName()%></a>
@@ -241,15 +241,15 @@
</display:column>
<% } else { %>
<display:column title=3D''>
- <a href=3D'<%=3Djff.getDownloadUrl()=
%>' folder=3D'<%=3D request.getScheme() + "://" +
+ <a href=3D'<%=3DJahiaTools.replacePa=
ttern(org.jahia.engines.filemanager.TableEntry.javascriptDecode(jff.getDown=
loadUrl()),"'","'")%>' folder=3D'<%=3D request.getScheme() + "://" +
request.getServerName() + (request.=
getServerPort()!=3D80?":" + request.getServerPort():"") +
- org.jahia.engines.filemanager.Tabl=
eEntry.javascriptDecode(jff.getDownloadUrl().substring(0, jff.getDownloadUr=
l().lastIndexOf("/"))) %>' style=3D"behavior:url(#default#AnchorClick);marg=
in-right:0px!important;padding-right:0px!important;"
+ JahiaTools.replacePattern(org.jahia=
.engines.filemanager.TableEntry.javascriptDecode(jff.getDownloadUrl().subst=
ring(0, jff.getDownloadUrl().lastIndexOf("/"))),"'","'") %>' style=3D"b=
ehavior:url(#default#AnchorClick);margin-right:0px!important;padding-right:=
0px!important;"
target=3D"_blank"><img title=3D"Open =
in IE folder" alt=3D"IE Folder" border=3D"0" src=3D"<content:serverHttpPath=
/>/jsp/jahia/javascript/zimbra/complexTree/IEFolder.gif" /></a>
</display:column>
<% }
} else if ( searchDetail.getName().equals(=
"File")) {%>
<display:column title=3D'<%=3DgetResourceBund=
le("search.file","File",jData)%>' sortable=3D"true" sortProperty=3D"fileNam=
e" comparator=3D"<%=3D comparator %>">
- <!--<%=3DcurrentName%>--><a href=3D'<%=3D=
jff.getDownloadUrl()%>' class=3D"<%=3Dextention%>" target=3D"_blank"><%=3Dc=
urrentName%></a>
+ <!--<%=3DcurrentName%>--><a href=3D'<%=3D=
JahiaTools.replacePattern(jff.getDownloadUrl(),"'","'")%>' class=3D"<%=
=3Dextention%>" target=3D"_blank"><%=3DcurrentName%></a>
</display:column>
<% } else if ( searchDetail.getName().equals(=
"Author")) { %>
<logic:equal name=3D"displayDetails" value=3D=
"true">
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/box/searchbox.inc&rev=3D686&repname=3Dcorporate_portal_templat=
es_v2
=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-ACG-BRANCH/src/jsp/box/searchbox.inc (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc Wed May 30 17:02:25=
2007
@@ -233,8 +233,14 @@
currentName.length());
} %>
<!--display:column property=3D"ranking" title=3D'<%=3Dg=
etResourceBundle("search.rank","Ranking",jData)%>' sortable=3D"true"/-->
+ <display:column title=3D''>
+ <a href=3D'<%=3DJahiaTools.replacePattern(org.jahia.en=
gines.filemanager.TableEntry.javascriptDecode(jff.getDownloadUrl()),"'","&#=
39;")%>' folder=3D'<%=3D request.getScheme() + "://" +
+ request.getServerName() + (request.getServerPort()!=
=3D80?":" + request.getServerPort():"") +
+ JahiaTools.replacePattern(org.jahia.engines.filemanag=
er.TableEntry.javascriptDecode(jff.getDownloadUrl().substring(0, jff.getDow=
nloadUrl().lastIndexOf("/"))),"'","'") %>' style=3D"behavior:url(#defau=
lt#AnchorClick);margin-right:0px!important;padding-right:0px!important;"
+ target=3D"_blank"><img title=3D"Open in IE folder" alt=
=3D"IE Folder" border=3D"0" src=3D"<content:serverHttpPath/>/jsp/jahia/java=
script/zimbra/complexTree/IEFolder.gif" /></a>
+ </display:column>
<display:column title=3D'<%=3DgetResourceBundle("search=
.file","File",jData)%>' sortable=3D"true" sortProperty=3D"fileName" compara=
tor=3D"<%=3D comparator %>">
- <!--<%=3DcurrentName%>--><a href=3D'<%=3Djff.getDow=
nloadUrl()%>' class=3D"<%=3Dextention%>" target=3D"_blank"><%=3DcurrentName=
%></a>
+ <!--<%=3DcurrentName%>--><a href=3D'<%=3DJahiaTools=
.replacePattern(org.jahia.engines.filemanager.TableEntry.javascriptDecode(j=
ff.getDownloadUrl()),"'","'")%>' class=3D"<%=3Dextention%>" target=3D"_=
blank"><%=3DcurrentName%></a>
</display:column>
<logic:equal name=3D"displayDetails" value=3D"true">
<display:column property=3D"author"
title=3D'<%=3Dget=
ResourceBundle("search.author","Author",jData)%>' sortable=3D"true" compara=
tor=3D"<%=3D comparator %>" />
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
