xlawrence 2005/11/09 16:04:14 CET
Modified files:
core/src/webapp/jsp/jahia/engines/selectpage close.jsp
select_page.jsp
core/src/webapp/jsp/jahia/engines/shared page_field.jsp
Log:
JAHIA-516
- Corrected javascript problem when trying to change a page field into a
Linked page. The URL contained 2 "?"
Revision Changes Path
1.4 +1 -7
jahia/core/src/webapp/jsp/jahia/engines/selectpage/close.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/selectpage/close.jsp.diff?r1=1.3&r2=1.4&f=h
1.9 +6 -8
jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp.diff?r1=1.8&r2=1.9&f=h
1.14 +9 -2
jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp.diff?r1=1.13&r2=1.14&f=h
Index: close.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/selectpage/close.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- close.jsp 19 Oct 2005 14:22:02 -0000 1.3
+++ close.jsp 9 Nov 2005 15:04:13 -0000 1.4
@@ -3,12 +3,9 @@
<%@ page language="java" %>
<%!
private static final org.apache.log4j.Logger logger =
- org.apache.log4j.Logger.getLogger("jsp.jahia.engines.engine");
+
org.apache.log4j.Logger.getLogger("jsp.jahia.engines.selectpage.close");
%>
<%
- /**
- * @version $Id: close.jsp,v 1.3 2005/10/19 14:22:02 dpillot Exp $
- */
final HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
final String operation =
(String)engineMap.get(SelectPage_Engine.OPERATION);
@@ -17,12 +14,6 @@
final String callback = (String)engineMap.get("cond");
logger.debug("condition="+callback);
- /**
- * $Log: close.jsp,v $
- * Revision 1.3 2005/10/19 14:22:02 dpillot
- * content pick final enhancements
- *
- */
%>
<script type="text/javascript">
Index: select_page.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- select_page.jsp 19 Oct 2005 14:22:15 -0000 1.8
+++ select_page.jsp 9 Nov 2005 15:04:13 -0000 1.9
@@ -11,13 +11,9 @@
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%!
private static final org.apache.log4j.Logger logger =
- org.apache.log4j.Logger.getLogger("jsp.jahia.engines.engine");
+
org.apache.log4j.Logger.getLogger("jsp.jahia.engines.selectpage.select_page");
%>
-
<%
- /**
- * @version $Id: select_page.jsp,v 1.8 2005/10/19 14:22:15 dpillot Exp $
- */
final HashMap selectedPageParams = (HashMap)
session.getAttribute(SelectPage_Engine.SESSION_PARAMS);
final HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
final ParamBean jParams = (ParamBean)
request.getAttribute("org.jahia.params.ParamBean");
@@ -44,7 +40,7 @@
<script type="text/javascript">
function handleActionChanges(param) {
saveContent();
- document.mainForm.action += "?screen=" + param;
+ document.mainForm.screen.value = param;
document.mainForm.submit();
}
</script>
@@ -180,7 +176,6 @@
for (int level = 0; level < treeJahiaSiteMap.getMaxLevel(); level++) {
shouldDrawLineSegment.add(level, Boolean.TRUE);
}
- int classNb = 0;
boolean isInsertionPoint = false;
boolean allowPageSelection;
for (int i = 0; i < treeJahiaSiteMap.size(); i++) {
@@ -448,6 +443,10 @@
/**
* $Log: select_page.jsp,v $
+ * Revision 1.9 2005/11/09 15:04:13 xlawrence
+ * JAHIA-516
+ * - Corrected javascript problem when trying to change a page field into
a Linked page. The URL contained 2 "?"
+ *
* Revision 1.8 2005/10/19 14:22:15 dpillot
* content pick final enhancements
*
Index: page_field.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- page_field.jsp 21 Oct 2005 14:02:37 -0000 1.13
+++ page_field.jsp 9 Nov 2005 15:04:14 -0000 1.14
@@ -21,7 +21,7 @@
<%
/**
- * @version $Id: page_field.jsp,v 1.13 2005/10/21 14:02:37 dpillot Exp $
+ * @version $Id: page_field.jsp,v 1.14 2005/11/09 15:04:14 xlawrence Exp
$
*/
final HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -231,7 +231,11 @@
function handleActionChanges(param) {
saveContent();
- document.mainForm.action += "?screen=" + param;
+ var sep = "?";
+ if (document.mainForm.action.indexOf("?") > 0) {
+ sep = "&";
+ }
+ document.mainForm.action += sep + "screen=" + param;
document.mainForm.submit();
}
@@ -464,6 +468,10 @@
<%
/**
* $Log: page_field.jsp,v $
+ * Revision 1.14 2005/11/09 15:04:14 xlawrence
+ * JAHIA-516
+ * - Corrected javascript problem when trying to change a page field
into a Linked page. The URL contained 2 "?"
+ *
* Revision 1.13 2005/10/21 14:02:37 dpillot
* http://www.jahia.net/jira/browse/JAHIA-341
*
