shuber 2004/11/02 18:49:39 CET
Modified files:
core/src/java/org/jahia/engines/pages
PageProperties_Engine.java
core/src/java/org/jahia/views/engines/versioning/pages/actions
PagesVersioningAction.java
core/src/webapp/WEB-INF/etc/struts jahia-tiles-defs.xml
struts-config.xml
core/src/webapp/views/engines/versioning/pages
confirm_page_undelete.jsp
confirm_restore.jsp
confirm_undo_staging.jsp
operation_choices.jsp
restore_version_test_result.jsp
revisions-list.jsp
sitemap.jsp
Added files:
core/src/webapp/views/engines/versioning/pages
common-javascript.inc
tree-locked.jsp
core/src/conf/java ApplicationResources.properties
ApplicationResources_en.properties
ApplicationResources_fr.properties
Log:
Fix for JAHIA-222 :
- Implemented a new locking mechanism that locks all the page subtree when we enter
the versioning tab, and frees it when we either change the tab, or close the popup
window.
Revision Changes Path
1.1 +6 -0 jahia/core/src/conf/java/ApplicationResources.properties (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/ApplicationResources.properties?rev=1.1&content-type=text/plain
1.1 +6 -0 jahia/core/src/conf/java/ApplicationResources_en.properties
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/ApplicationResources_en.properties?rev=1.1&content-type=text/plain
1.1 +6 -0 jahia/core/src/conf/java/ApplicationResources_fr.properties
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/ApplicationResources_fr.properties?rev=1.1&content-type=text/plain
1.6 +59 -1
jahia/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java.diff?r1=1.5&r2=1.6&f=h
1.4 +96 -8
jahia/core/src/java/org/jahia/views/engines/versioning/pages/actions/PagesVersioningAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/views/engines/versioning/pages/actions/PagesVersioningAction.java.diff?r1=1.3&r2=1.4&f=h
1.4 +5 -1 jahia/core/src/webapp/WEB-INF/etc/struts/jahia-tiles-defs.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/struts/jahia-tiles-defs.xml.diff?r1=1.3&r2=1.4&f=h
1.3 +3 -0 jahia/core/src/webapp/WEB-INF/etc/struts/struts-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/struts/struts-config.xml.diff?r1=1.2&r2=1.3&f=h
1.1 +38 -0
jahia/core/src/webapp/views/engines/versioning/pages/common-javascript.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/common-javascript.inc?rev=1.1&content-type=text/plain
1.2 +1 -15
jahia/core/src/webapp/views/engines/versioning/pages/confirm_page_undelete.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/confirm_page_undelete.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -14
jahia/core/src/webapp/views/engines/versioning/pages/confirm_restore.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/confirm_restore.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -14
jahia/core/src/webapp/views/engines/versioning/pages/confirm_undo_staging.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/confirm_undo_staging.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -28
jahia/core/src/webapp/views/engines/versioning/pages/operation_choices.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/operation_choices.jsp.diff?r1=1.1&r2=1.2&f=h
1.3 +1 -14
jahia/core/src/webapp/views/engines/versioning/pages/restore_version_test_result.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/restore_version_test_result.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -26
jahia/core/src/webapp/views/engines/versioning/pages/revisions-list.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/revisions-list.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -28 jahia/core/src/webapp/views/engines/versioning/pages/sitemap.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/sitemap.jsp.diff?r1=1.2&r2=1.3&f=h
1.1 +35 -0
jahia/core/src/webapp/views/engines/versioning/pages/tree-locked.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/tree-locked.jsp?rev=1.1&content-type=text/plain
Index: PageProperties_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PageProperties_Engine.java 17 Aug 2004 13:56:49 -0000 1.5
+++ PageProperties_Engine.java 2 Nov 2004 17:49:37 -0000 1.6
@@ -1,4 +1,4 @@
-// $Id: PageProperties_Engine.java,v 1.5 2004/08/17 13:56:49 knguyen Exp $
+// $Id: PageProperties_Engine.java,v 1.6 2004/11/02 17:49:37 shuber Exp $
//
//
// ____.
@@ -61,6 +61,8 @@
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.views.engines.contentdefinition.ContentDefinitionEngine;
+import org.jahia.services.cache.HtmlCache;
+import org.jahia.views.engines.versioning.pages.actions.PagesVersioningAction;
/**
* <p>Title: </p> <p>Description: </p> <p>Copyright: Copyright (c) 2002</p>
<p>Company: </p>
@@ -245,6 +247,38 @@
new Integer (JahiaEngine.RENDERTYPE_FORWARD));
// reset engine map to default value
engineMap.remove (ENGINE_OUTPUT_FILE_PARAM);
+
+ releaseAllVersioningLocks(jParams);
+
+ // now let's reacquire the page lock for this page, as we
+ // have cleared it as part of the page subtree.
+ LockService lockRegistry = ServicesRegistry.getInstance ().
+ getLockService ();
+ if (jParams.settings ().areLocksActivated ()) {
+ LockKey lockKey = LockKey.composeLockKey (LockKey.
+ UPDATE_PAGE_TYPE,
+ thePage.getID (),
thePage.getID ());
+ if (lockRegistry.acquire (lockKey, jParams.getUser (),
+ jParams.getSessionID (),
+ jParams.getSession ().
+ getMaxInactiveInterval ())) {
+
+ // since we cannot efficiently determine all the references
+ // to this page we do an entire cache flush.
+ /** @todo is there a better way to do this ? */
+ CacheFactory.getHtmlCache().flush();
+ // #endif
+ // #ifdef LOCK
+ } else {
+ // Prerequisites are NOT completed ! Damned ! Redirect the
JSP
+ // output to lock informations.
+ LockEngine.getInstance ().redirect (jParams, engineMap,
+ lockKey);
+ }
+ }
+ // #endif
+
+
} else {
throw new JahiaForbiddenAccessException ();
}
@@ -894,4 +928,28 @@
return thePage;
}
+ private void releaseAllVersioningLocks (ParamBean jParams)
+ throws JahiaException {
+ if (jParams.settings ().areLocksActivated ()) {
+ ArrayList acquiredPageLocks = (ArrayList)
jParams.getSession().getAttribute(PagesVersioningAction.SESSION_VERSIONING_LOCK_LIST);
+ if (acquiredPageLocks == null) {
+ return;
+ }
+ HtmlCache htmlCache = CacheFactory.getHtmlCache();
+ ContentPage contentPage = ServicesRegistry.getInstance ().
+ getJahiaPageService ().lookupContentPage (jParams.getPageID (),
false);
+
+ // Lock all page site if possible.
+ LockService lockRegistry = ServicesRegistry.getInstance
().getLockService ();
+ Iterator acquiredPageIter = acquiredPageLocks.iterator();
+ while (acquiredPageIter.hasNext()) {
+ int curPageID = ((Integer) acquiredPageIter.next()).intValue();
+ LockKey lockKey = LockKey.composeLockKey (LockKey.UPDATE_PAGE_TYPE,
+ curPageID, curPageID);
+ lockRegistry.release (lockKey, jParams.getUser (),
jParams.getSessionID ());
+ htmlCache.invalidatePageEntries(Integer.toString(curPageID));
+ }
+ }
+ }
+
}
Index: PagesVersioningAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/views/engines/versioning/pages/actions/PagesVersioningAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PagesVersioningAction.java 4 Oct 2004 18:04:43 -0000 1.3
+++ PagesVersioningAction.java 2 Nov 2004 17:49:37 -0000 1.4
@@ -89,6 +89,8 @@
private static final String ENGINE_TITLE = "Pages Versioning";
+ public static final String SESSION_VERSIONING_LOCK_LIST =
"org.jahia.views.engines.versioning.pages.Locks";
+
/**
* Init Engine Data
*
@@ -235,6 +237,16 @@
request.getAttribute(JahiaEngineViewHelper.ENGINE_VIEW_HELPER);
engineCommonData = (JahiaEngineCommonData)
request.getAttribute(JahiaEngineCommonData.JAHIA_ENGINE_COMMON_DATA);
+
+ // before we go any further, let's try to acquire all the locks
+ // on the page sub tree.
+ ActionMessages messages = new ActionMessages();
+ boolean lockingSuccessful =
acquireAllLocks(engineCommonData.getParamBean(), messages);
+ if (!lockingSuccessful) {
+ forward = mapping.findForward("pageTreeLocked");
+ saveMessages(request, messages);
+ }
+
} catch ( Throwable t ){
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
@@ -539,7 +551,6 @@
pagesToRestore.put(pageID,langs);
}
- ArrayList acquiredPageLocks =
acquireAllLocks(engineCommonData.getParamBean());
switch( pagesVersViewHelper.getOperationType() ){
case PagesVersioningViewHelper.UNDO_STAGING_OPERATION :
{
@@ -570,7 +581,6 @@
break;
}
- releaseAllLocks(engineCommonData.getParamBean(), acquiredPageLocks);
// reload revisions
if ( pagesVersViewHelper.getContentTreeRevisionsVisitor() != null ){
@@ -579,6 +589,7 @@
String method = request.getParameter(mapping.getParameter());
if ( method.equals("restoreSave") ){
+ releaseAllLocks(engineCommonData.getParamBean());
request.setAttribute("engines.close.refresh-opener","yes");
request.setAttribute("engines.close.opener-url-params","&reloaded=yes");
forward = mapping.findForward("EnginesCloseAnyPopup");
@@ -689,6 +700,48 @@
}
/**
+ * Closes the window, liberating all the locked resources.
+ * @param mapping ActionMapping
+ * @param form ActionForm
+ * @param request HttpServletRequest
+ * @param response HttpServletResponse
+ * @return ActionForward
+ * @throws IOException
+ * @throws ServletException
+ */
+ public ActionForward close(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException {
+
+ ActionForward forward = mapping.findForward("close");
+ ActionErrors errors = new ActionErrors();
+ PagesVersioningViewHelper pagesVersViewHelper = null;
+ JahiaEngineCommonData engineCommonData = null;
+ try {
+ init(mapping,request);
+ getRevisionsListFormData(mapping,form,request,response);
+ getSiteMapFormData(mapping,form,request,response);
+ pagesVersViewHelper = (PagesVersioningViewHelper)
+ request.getAttribute(JahiaEngineViewHelper.ENGINE_VIEW_HELPER);
+ engineCommonData = (JahiaEngineCommonData)
+
request.getAttribute(JahiaEngineCommonData.JAHIA_ENGINE_COMMON_DATA);
+
+ releaseAllLocks(engineCommonData.getParamBean());
+
+ } catch ( Throwable t ){
+ JahiaErrorDisplay.DisplayException(request, response,
+ super.getServlet().getServletContext(), t);
+ errors.add(ActionErrors.GLOBAL_ERROR,
+ new ActionError("Error preparing Operation Choices view"));
+ }
+ // set engine screen
+ request.setAttribute("engineView","close");
+ return continueForward(mapping,request,errors,forward);
+ }
+
+ /**
*
* @param mapping
* @param form
@@ -1714,7 +1767,15 @@
}
// #ifdef LOCK
- private ArrayList acquireAllLocks (ParamBean jParams)
+ /**
+ * Tries to acquire all the locks for all the sub pages starting at the
+ * current page
+ * @param jParams ParamBean
+ * @return boolean true if all the sub pages could be locked, false
+ * otherwise.
+ * @throws JahiaException
+ */
+ private boolean acquireAllLocks (ParamBean jParams, ActionMessages messages)
throws JahiaException {
ArrayList acquiredPageLocks = new ArrayList();
if (jParams.settings ().areLocksActivated ()) {
@@ -1741,6 +1802,25 @@
// Lock all page site if possible.
LockService lockRegistry = ServicesRegistry.getInstance
().getLockService ();
+
+ // first let's test if we can acquire ALL the sub pages locks
+ // before we start locking anything, otherwise we would end up
+ // with half locked trees.
+ for (int i = 0; i < treeSiteMapViewHelper.size (); i++) {
+ ContentPage siteMapContentPage =
treeSiteMapViewHelper.getContentPage (i);
+ if (siteMapContentPage != null) {
+ LockKey lockKey = LockKey.composeLockKey
(LockKey.UPDATE_PAGE_TYPE,
+ siteMapContentPage.getID (), siteMapContentPage.getID
());
+ if (!lockRegistry.isAcquireable (lockKey, user,
jParams.getSessionID ())) {
+ // acquiring of all locks was not successfull, we
+ // exit immediately.
+ messages.add(ActionMessages.GLOBAL_MESSAGE,
+ new
ActionMessage("message.org.jahia.views.engines.versioning.pages.cannotLockPage", new
Integer(siteMapContentPage.getID())));
+ return false;
+ }
+ }
+ }
+
for (int i = 0; i < treeSiteMapViewHelper.size (); i++) {
ContentPage siteMapContentPage =
treeSiteMapViewHelper.getContentPage (i);
if (siteMapContentPage != null) {
@@ -1754,19 +1834,27 @@
siteMapContentPage.getTitles (true));
acquiredPageLocks.add(new
Integer(siteMapContentPage.getID()));
} else {
- logger.debug (
- "Cannot acquire lock for page " +
- siteMapContentPage.getTitles (true));
+ // this case really shouldn't happen since we have
+ // already previously tested lock availability, but
+ // might happen under loads when the two operations
+ // are not perfectly atomic.
+ logger.warn ("Warning, page tree was partly locked for
updating, you might want to clear the locks manually.");
+ return false;
}
}
}
}
- return acquiredPageLocks;
+ jParams.getSession().setAttribute(SESSION_VERSIONING_LOCK_LIST,
acquiredPageLocks);
+ return true;
}
- private void releaseAllLocks (ParamBean jParams, ArrayList acquiredPageLocks)
+ private void releaseAllLocks (ParamBean jParams)
throws JahiaException {
if (jParams.settings ().areLocksActivated ()) {
+ ArrayList acquiredPageLocks = (ArrayList)
jParams.getSession().getAttribute(SESSION_VERSIONING_LOCK_LIST);
+ if (acquiredPageLocks == null) {
+ return;
+ }
HtmlCache htmlCache = CacheFactory.getHtmlCache();
ContentPage contentPage = ServicesRegistry.getInstance ().
getJahiaPageService ().lookupContentPage (jParams.getPageID (),
false);
Index: jahia-tiles-defs.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/struts/jahia-tiles-defs.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jahia-tiles-defs.xml 17 Aug 2004 13:57:35 -0000 1.3
+++ jahia-tiles-defs.xml 2 Nov 2004 17:49:37 -0000 1.4
@@ -11,7 +11,6 @@
-->
<tiles-definitions>
-
<definition name="engines.default.layout"
path="/views/engines/engines_default_layout.jsp">
<put name="header" value="/views/engines/common/header.jsp" />
<put name="footer" value="/views/engines/common/footer.jsp" />
@@ -95,6 +94,11 @@
<put name="body-content"
value="/views/engines/versioning/pages/operation_choices.jsp" />
</definition>
+ <!-- versioning engine : for pages : page sub tree locked view -->
+ <definition name="engines.versioning.pages.tree-locked"
extends="engines.versioning.pages">
+ <put name="body-content"
value="/views/engines/versioning/pages/tree-locked.jsp" />
+ </definition>
+
<!--=======================================================================-->
<!-- versioning revisions detail -->
<definition name="engines.versioning.revisionsdetail"
extends="engines.default.layout">
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/struts/struts-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-config.xml 28 Jul 2004 11:54:50 -0000 1.2
+++ struts-config.xml 2 Nov 2004 17:49:37 -0000 1.3
@@ -106,6 +106,9 @@
<forward name="confirmUndoStaging"
path="engines.versioning.pages.confirm-undo-staging" />
<forward name="confirmPageUndelete"
path="engines.versioning.pages.confirm-page-undelete" />
<forward name="revisionsDetail"
path="/do/RevisionEntrySetDetail?method=revisionsDetail&reloaded=yes" />
+ <forward name="close" path="engines.close" />
+ <forward name="pageTreeLocked"
path="engines.versioning.pages.tree-locked">
+ </forward>
</action>
<!-- Versioning Revisions Detail -->
Index: common-javascript.inc
====================================================================
<script language="javascript" type="text/javascript">
<!--
document.onkeydown = keyDown;
function keyDown() {
if (document.all) {
var ieKey = event.keyCode;
if (ieKey == 13) { document.retryForm.submit(); }
if (ieKey == 87 && event.ctrlKey) { window.close(); }
}
}
function sendFormSave()
{
window.close();
}
function sendFormClose()
{
sendForm('close', '');
}
function sendForm(method,params)
{
document.mainForm.method = "POST";
document.mainForm.action = "<%=actionURL%>&engineview=<%=engineView%>&method=" +
method;
if ( params != null && params != "" ){
if ( params.charAt(0) == "&" ){
document.mainForm.action += params;
} else {
document.mainForm.action += "&" + params;
}
}
document.mainForm.submit();
}
//-->
</script>
Index: tree-locked.jsp
====================================================================
<%@ page language="java" %>
<%@ page import="java.util.*" %>
<%@ page import="org.jahia.views.engines.*" %>
<%@ page import="org.jahia.views.engines.versioning.pages.PagesVersioningViewHelper"
%>
<[EMAIL PROTECTED] file="/views/engines/common/taglibs.jsp" %>
<%
String actionURL = (String)request.getAttribute("PagesVersioning.ActionURL");
String engineView = (String)request.getAttribute("engineView");
PagesVersioningViewHelper pagesVersViewHelper =
(PagesVersioningViewHelper)request.getAttribute(JahiaEngineViewHelper.ENGINE_VIEW_HELPER);
HashMap engineMap = (HashMap)request.getAttribute("jahia_session_engineMap");
String theScreen = (String)engineMap.get("screen");
%>
<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
if (screen.availHeight <= 600) {
window.moveTo(0,0);
window.resizeTo(660, screen.availHeight);
} else {
window.resizeTo(660, 740);
}
//-->
</script>
<form method="POST" name="mainForm" action="<bean:write filter="false"
name="jahiaEngineCommonData" property="engineURL" />&screen=versioning">
<input type="hidden" name="lastscreen" value="<%=theScreen%>">
<html:messages id="currentMessage" message="true">
<ul>
<li><bean:write name="currentMessage" /></li>
</ul>
</html:messages>
</form>
Index: confirm_page_undelete.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/confirm_page_undelete.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm_page_undelete.jsp 30 Mar 2004 14:16:27 -0000 1.1
+++ confirm_page_undelete.jsp 2 Nov 2004 17:49:38 -0000 1.2
@@ -11,23 +11,9 @@
String theScreen = (String)engineMap.get("screen");
%>
-
+<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
-document.onkeydown = keyDown;
-function keyDown() {
- if (document.all) {
- var ieKey = event.keyCode;
- if (ieKey == 13) { document.retryForm.submit(); }
- if (ieKey == 87 && event.ctrlKey) { window.close(); }
- }
-}
-
-function sendFormSave()
-{
- window.close();
-}
-
function sendFormApply()
{
sendForm('restoreApply','');
Index: confirm_restore.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/confirm_restore.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm_restore.jsp 30 Mar 2004 14:16:27 -0000 1.1
+++ confirm_restore.jsp 2 Nov 2004 17:49:38 -0000 1.2
@@ -13,22 +13,9 @@
String restoreExactLabel =
(String)request.getAttribute("pagesversioning.restore_exact");
%>
-
+<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
-document.onkeydown = keyDown;
-function keyDown() {
- if (document.all) {
- var ieKey = event.keyCode;
- if (ieKey == 13) { document.retryForm.submit(); }
- if (ieKey == 87 && event.ctrlKey) { window.close(); }
- }
-}
-
-function sendFormSave()
-{
- window.close();
-}
function sendFormApply()
{
Index: confirm_undo_staging.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/confirm_undo_staging.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm_undo_staging.jsp 30 Mar 2004 14:16:27 -0000 1.1
+++ confirm_undo_staging.jsp 2 Nov 2004 17:49:38 -0000 1.2
@@ -11,22 +11,9 @@
String theScreen = (String)engineMap.get("screen");
%>
-
+<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
-document.onkeydown = keyDown;
-function keyDown() {
- if (document.all) {
- var ieKey = event.keyCode;
- if (ieKey == 13) { document.retryForm.submit(); }
- if (ieKey == 87 && event.ctrlKey) { window.close(); }
- }
-}
-
-function sendFormSave()
-{
- window.close();
-}
function sendFormApply()
{
Index: operation_choices.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/operation_choices.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- operation_choices.jsp 30 Mar 2004 14:16:27 -0000 1.1
+++ operation_choices.jsp 2 Nov 2004 17:49:38 -0000 1.2
@@ -15,7 +15,7 @@
String theScreen = (String)engineMap.get("screen");
%>
-
+<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
if (screen.availHeight <= 600) {
@@ -24,33 +24,6 @@
} else {
window.resizeTo(660, 740);
}
-
-document.onkeydown = keyDown;
-function keyDown() {
- if (document.all) {
- var ieKey = event.keyCode;
- if (ieKey == 13) { document.retryForm.submit(); }
- if (ieKey == 87 && event.ctrlKey) { window.close(); }
- }
-}
-
-function sendFormSave()
-{
- window.close();
-}
-
-function sendForm(method,params)
-{
- document.mainForm.method = "POST";
- document.mainForm.action = "<%=actionURL%>&engineview=<%=engineView%>&method="
+ method;
- if ( params.charAt(0) == "&" ){
- document.mainForm.action += params;
- } else {
- document.mainForm.action += "&" + params;
- }
- document.mainForm.submit();
-}
-
//-->
</script>
<br><br>
Index: restore_version_test_result.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/restore_version_test_result.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- restore_version_test_result.jsp 24 Sep 2004 13:25:18 -0000 1.2
+++ restore_version_test_result.jsp 2 Nov 2004 17:49:38 -0000 1.3
@@ -29,22 +29,9 @@
=
(JahiaEngineCommonDataInterface)request.getAttribute("jahiaEngineCommonData");
%>
+<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
-document.onkeydown = keyDown;
-function keyDown() {
- if (document.all) {
- var ieKey = event.keyCode;
- if (ieKey == 13) { document.retryForm.submit(); }
- if (ieKey == 87 && event.ctrlKey) { window.close(); }
- }
-}
-
-function sendFormSave()
-{
- window.close();
-}
-
//-->
</script>
<br><br>
Index: revisions-list.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/revisions-list.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- revisions-list.jsp 27 May 2004 09:54:16 -0000 1.2
+++ revisions-list.jsp 2 Nov 2004 17:49:38 -0000 1.3
@@ -47,34 +47,9 @@
String toDatePickerURL = jParams.composeStrutsUrl("DatePicker",new
Properties(),"&method=displayCalendar&dateEventParam="+toDateEventParam);
%>
+<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
-document.onkeydown = keyDown;
-function keyDown() {
- if (document.all) {
- var ieKey = event.keyCode;
- if (ieKey == 13) { document.retryForm.submit(); }
- if (ieKey == 87 && event.ctrlKey) { window.close(); }
- }
-}
-
-function sendFormSave()
-{
- window.close();
-}
-
-function sendForm(method,params)
-{
- document.mainForm.method = "POST";
- document.mainForm.action = "<%=actionURL%>&engineview=<%=engineView%>&method="
+ method;
- if ( params.charAt(0) == "&" ){
- document.mainForm.action += params;
- } else {
- document.mainForm.action += "&" + params;
- }
- document.mainForm.submit();
-}
-
function sortRevisions(sortAttribute,sortOrder)
{
document.mainForm.sortAttribute.value = sortAttribute;
Index: sitemap.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/sitemap.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.jsp 27 May 2004 09:54:16 -0000 1.2
+++ sitemap.jsp 2 Nov 2004 17:49:38 -0000 1.3
@@ -58,36 +58,9 @@
String theScreen = (String)engineMap.get("screen");
%>
+<[EMAIL PROTECTED] file="common-javascript.inc" %>
<script language="javascript">
<!--
-document.onkeydown = keyDown;
-function keyDown() {
- if (document.all) {
- var ieKey = event.keyCode;
- if (ieKey == 13) { document.retryForm.submit(); }
- if (ieKey == 87 && event.ctrlKey) { window.close(); }
- }
-}
-
-function sendFormSave()
-{
- window.close();
-}
-
-function sendForm(method,params)
-{
- document.mainForm.method = "POST";
- document.mainForm.action = "<%=actionURL%>&engineview=<%=engineView%>&method="
+ method;
- if ( params != null && params != "" ){
- if ( params.charAt(0) == "&" ){
- document.mainForm.action += params;
- } else {
- document.mainForm.action += "&" + params;
- }
- }
- document.mainForm.submit();
-}
-
function selectSubTree(startNodeName, operation, language) {
if ( !document.mainForm.elements[startNodeName].disabled && operation ==
'select' )
Index: ApplicationResources.properties
====================================================================
# HelloWorld Engine
error.name.required = "Name is required"
error.engineCommonData.exception = "Exception occured when creating EngineCommonData"
message.org.jahia.views.engines.versioning.pages.cannotLockPage = Page {0} is
locked, cannot perform versioning operations, please try again later.
Index: ApplicationResources_en.properties
====================================================================
# HelloWorld Engine
error.name.required = "Name is required"
error.engineCommonData.exception = "Exception occured when creating EngineCommonData"
message.org.jahia.views.engines.versioning.pages.cannotLockPage = Page {0} is
locked, cannot perform versioning operations, please try again later.
Index: ApplicationResources_fr.properties
====================================================================
# HelloWorld Engine
error.name.required = "Le nom est requis"
error.engineCommonData.exception = "Une exception a �t� lev� lors de la cr�ation de
l'EngineCommonData"
message.org.jahia.views.engines.versioning.pages.cannotLockPage = La page {0} est
v�rouill�e, les op�rations de versioning sont interdites, veuillez r�-essayer plus
tard.
