Author: xlawrence
Date: Tue Jun 26 16:10:10 2007
New Revision: 17778
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17778&repname=
=3Djahia
Log:
implement issue http://www.jahia.net/jira/browse/ATOS-52: Perte des liens d=
'aide dans les erreurs de workflow
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/GuiBean.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
lose.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/adv_workflow.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/showReport.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/GuiBean.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/gui/GuiBean.java&rev=3D17778&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/gui/GuiBean.java (=
original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/GuiBean.java T=
ue Jun 26 16:10:10 2007
@@ -37,7 +37,6 @@
import org.jahia.engines.filemanager.TableEntry;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ProcessingContext;
-import org.jahia.params.ParamBean;
import org.jahia.registries.EnginesRegistry;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.acl.ACLResource;
@@ -560,6 +559,30 @@
}
}
=
+ public String drawPagePropertiesUrl(final ContentPage page) throws Jah=
iaException {
+ return drawPagePropertiesUrl(page.getID());
+ }
+
+ public String drawPagePropertiesUrl(final int pageID) throws JahiaExce=
ption {
+ final int oldPageID =3D jParams.getPageID();
+ if (oldPageID !=3D pageID) jParams.changePage(pageID);
+ final JahiaACLManagerService aclService =3D ServicesRegistry.getIn=
stance().getJahiaACLManagerService();
+ final String result;
+ if (aclService.getSiteActionPermission("engines.actions.update",
+ jParams.getUser(), JahiaBaseACL.READ_RIGHTS,
+ jParams.getSiteID()) > 0 &&
+ aclService.getSiteActionPermission("engines.languages." + =
jParams.getLocale().toString(),
+ jParams.getUser(),
+ JahiaBaseACL.READ_RIGHTS,
+ jParams.getSiteID()) > 0) {
+ result =3D drawUrlCheckWriteAccess("pageproperties", jParams.g=
etPage());
+ } else {
+ result =3D "";
+ }
+ if (oldPageID !=3D pageID) jParams.changePage(oldPageID);
+ return result;
+ }
+
public String drawUpdateTemplateUrl(final JahiaPageDefinition theTempl=
ate)
throws JahiaException {
return drawUrlCheckWriteAccess("template", theTemplate);
@@ -575,12 +598,12 @@
return drawUrl("categoryEdit", parentCategoryKey);
}
=
- public String drawUpdateCategoryUrl(final Category category, final=
int nodeIndex)
+ public String drawUpdateCategoryUrl(final Category category, final int=
nodeIndex)
throws JahiaException {
return drawUrl("categoryEdit", category);
}
=
- public String drawAddSubCategoryUrl(final String parentCategoryKey,fin=
al int nodeIndex)
+ public String drawAddSubCategoryUrl(final String parentCategoryKey, fi=
nal int nodeIndex)
throws JahiaException {
return drawUrl("categoryEdit", parentCategoryKey);
}
@@ -786,7 +809,7 @@
public String drawMySettingsUrl() throws JahiaException {
return drawUrl("mysettings", null);
}
- =
+
public String drawMySettingsUrl(Object theObj) throws JahiaException {
return drawUrl("mysettings", theObj);
}
@@ -797,8 +820,8 @@
=
public String drawNewUserRegistrationUrl(Object theObj) throws JahiaEx=
ception {
return drawUrl("newuserregistration", theObj);
- } =
- =
+ }
+
public String drawSiteMapUrl() throws JahiaException {
return drawUrl("sitemap", null);
}
@@ -823,12 +846,12 @@
*/
private String drawUrl(final String engineName, final Object theObj)
throws JahiaException {
- String htmlResult =3D ""; =
+ String htmlResult =3D "";
final JahiaEngine theEngine =3D (JahiaEngine) EnginesRegistry.getI=
nstance().
getEngine(engineName);
if (theEngine.authoriseRender(jParams)) {
htmlResult =3D theEngine.renderLink(jParams, theObj);
- } =
+ }
return htmlResult;
}
// end drawUrl
@@ -861,7 +884,8 @@
}
if (ACLResource.checkWriteAccess(null, (ACLResourceInterfa=
ce) anObject, currentUser)) {
if (anObject instanceof JahiaPage) {
- if (ServicesRegistry.getInstance().getImportExport=
Service().isPicker(((JahiaPage)anObject).getContentPage())) {
+ if (ServicesRegistry.getInstance().getImportExport=
Service().isPicker(((JahiaPage) anObject).getContentPage()))
+ {
return "";
}
}
@@ -981,13 +1005,13 @@
boolean foundTarget =3D false;
while (thePath.hasMoreElements()) {
final ContentPage aPage =3D (ContentPage) thePath.nextElem=
ent();
- if (!foundTarget){
+ if (!foundTarget) {
foundTarget =3D (aPage.getID() =3D=3D thePage.getID());
}
if (aPage.getID() =3D=3D destPageID) {
return true;
}
- if (foundTarget){
+ if (foundTarget) {
break;
}
}
@@ -1007,13 +1031,13 @@
boolean foundTarget =3D false;
while (thePath.hasMoreElements()) {
final ContentPage aPage =3D (ContentPage) thePath.nextElem=
ent();
- if (!foundTarget){
+ if (!foundTarget) {
foundTarget =3D (aPage.getID() =3D=3D thePage.getID());
}
if (aPage.getID() =3D=3D destPageID) {
return true;
}
- if (foundTarget){
+ if (foundTarget) {
break;
}
}
@@ -1160,22 +1184,21 @@
}
return false;
} // end isIE7
- /***
+
+ /**
* isOpera
- *
*/
- public boolean isOpera(HttpServletRequest req)
- {
- String userAgent =3D req.getHeader( "user-agent" );
- if (userAgent !=3D null) {
- userAgent =3D userAgent.toLowerCase();
- if (userAgent.indexOf( "opera" ) !=3D -1) {
- return true;
- }
- }
- return false;
- } // end isOpera =
- =
+ public boolean isOpera(HttpServletRequest req) {
+ String userAgent =3D req.getHeader("user-agent");
+ if (userAgent !=3D null) {
+ userAgent =3D userAgent.toLowerCase();
+ if (userAgent.indexOf("opera") !=3D -1) {
+ return true;
+ }
+ }
+ return false;
+ } // end isOpera
+
/**
* isWindow
* JB 13.11.2001
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLTool=
Box.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.java&rev=3D17778&repname=3D=
jahia
=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/gui/HTMLToolBox.ja=
va (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va Tue Jun 26 16:10:10 2007
@@ -674,7 +674,6 @@
*
*/
public String drawShowReportLauncher(final String key) throws JahiaExc=
eption {
- // javascript:OpenJahiaScrollableWindow('/jahia/Jahia/engineName/w=
orkflow/op/edit/pid/1?screen=3Ddisplay&obj=3DContentPage_1','workflow_1B691=
8F79144F548B6229C458B71E690A',950,720)"
final StringBuffer buff =3D new StringBuffer();
final StringBuffer name =3D new StringBuffer();
name.append("workflow_showReport_");
@@ -716,24 +715,45 @@
* @return
* @throws JahiaException
*/
- public String drawPagePropertiesLauncher()
- throws JahiaException {
- return drawPagePropertiesLauncher(false);
+ public String drawPagePropertiesLauncher() throws JahiaException {
+ return drawPagePropertiesLauncher(false, jParams.getPageID());
}
=
/**
+ * returns the URL allowing to open the current page properties window
*
+ * @return
+ * @throws JahiaException
*/
- private String drawPagePropertiesLauncher(final boolean checkLock) thr=
ows JahiaException {
+ public String drawPagePropertiesLauncher(final int pageID) throws Jahi=
aException {
+ return drawPagePropertiesLauncher(false, pageID);
+ }
+
+ /**
+ * returns the URL allowing to open the current page properties window
+ *
+ * @return
+ * @throws JahiaException
+ */
+ public String drawPagePropertiesLauncher(final ContentPage page) throw=
s JahiaException {
+ return drawPagePropertiesLauncher(false, page.getID());
+ }
+
+ /**
+ *
+ */
+ private String drawPagePropertiesLauncher(final boolean checkLock,
+ final int pageId) throws Jah=
iaException {
final StringBuffer buff =3D new StringBuffer();
final StringBuffer name =3D new StringBuffer();
name.append("pageProperties_");
- if (jParams.getPage() !=3D null) {
- name.append(jParams.getPage().getID());
+ if (pageId > 0) {
+ name.append(pageId);
}
name.append(cleanSessionID(jParams.getSessionID()));
- final String out =3D gui.drawPagePropertiesUrl().equals("") ? "" :
- buff.append("OpenJahiaScrollableWindow('").append(gui.draw=
PagePropertiesUrl()).
+ final String url =3D gui.drawPagePropertiesUrl(pageId);
+ final String out =3D url.equals("") ? "" :
+ buff.append("OpenJahiaScrollableWindow('").append(url).
append("','").append(name.toString()).append("',")=
.append(JS_WINDOW_WIDTH).
append(",").append(JS_WINDOW_HEIGHT).append(")").t=
oString();
// #ifdef LOCK
@@ -947,7 +967,7 @@
}
} else if (objectClass =3D=3D ContentPage.class) {
if (LockKey.UPDATE_PAGE_TYPE.equals(lockKey.getType())) {
- launcher =3D drawPagePropertiesLauncher(false);
+ launcher =3D drawPagePropertiesLauncher(false, jParams.get=
PageID());
}
}
final LockService lockRegistry =3D ServicesRegistry.getInstance().
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/close.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/close.jsp&rev=3D17778&repn=
ame=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/webapp/jsp/jahia/engines/shared/c=
lose.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
lose.jsp Tue Jun 26 16:10:10 2007
@@ -21,7 +21,7 @@
<%@ page import=3D"org.jahia.engines.JahiaEngine" %>
<%@ page import=3D"org.jahia.params.ParamBean" %>
<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
-<%@ page import=3D"java.util.HashMap"%>
+<%@ page import=3D"java.util.HashMap" %>
<%@ page import=3D"org.jahia.engines.pages.PageProperties_Engine" %>
<%@ page import=3D"org.jahia.services.pages.JahiaPage" %>
=
@@ -53,34 +53,46 @@
window.onunload =3D function () {
}
<% if ( !addNew ){ %>
- <% if ("close".equals(theScreen)) { %>
- window.close();
- window.opener.handleActionChange("display");
- <% } else {
- if (theScreen=3D=3Dnull || theContainer=3D=3Dnull ||
- !("deletecontainer".equals(engineName) &&
"save".equals(theScreen)=
)) { %>
+ <% if ("close".equals(theScreen)) { %>
+ window.close();
+ window.opener.handleActionChange("display");
+ <% } else {
+ if (theScreen=3D=3Dnull || theContainer=3D=3Dnull ||
+ !("deletecontainer".equals(engineName) && "save".equals(the=
Screen))) { %>
<% if ("categoryEdit".equals(engineName)) { %>
window.close();
window.opener.waitForClosePopup();
<% } else if (PageProperties_Engine.ENGINE_NAME.equals(engineName)) {
JahiaPage thePage =3D (JahiaPage) engineMap.get("thePage");%>
- CloseJahiaWindowWithUrl("<%=3DjParams.composePageUrl(thePage.g=
etID()) %>");
- <% } else { %>
- CloseJahiaWindow('<%=3DrefreshOpener%>');
+ if (window.opener.name.indexOf("workflow_showReport_") > -1) {
+ // We are currently returning to the workflow error report, so we =
do not want to refresh the
+ // underlying window.
+ window.close();
+ } else {
+ CloseJahiaWindowWithUrl("<%=3DjParams.composePageUrl(thePage.getID=
()) %>");
+ }
+ <% } else { %>
+ if (window.opener.name.indexOf("workflow_showReport_") > -1) {
+ // We are currently returning to the workflow error report, so we =
do not want to refresh the
+ // underlying window.
+ window.close();
+ } else {
+ CloseJahiaWindow('<%=3DrefreshOpener%>');
+ }
<% } %>
<% } else { %>
<% ContentPage currentPage =3D jParams.getContentPage();
if (currentPage !=3D null &&
((currentPage.hasStagingEntries() || currentPage.hasActiveE=
ntries())
&& !currentPage.isStagedEntryMarkedForDeletion(jParams.ge=
tLocale().toString()))) { %>
- CloseJahiaWindow('<%=3DrefreshOpener%>');
+ CloseJahiaWindow('<%=3DrefreshOpener%>');
=
<% } else { %>
<% String savedCacheStatus =3D jParams.getCacheStatus();
jParams.setCacheStatus(ParamBean.CACHE_OFFONCE); %>
- CloseJahiaWindowWithUrl("<%=3DjParams.composePageUrl(theCon=
tainer.getPageID()) %>");
+ CloseJahiaWindowWithUrl("<%=3DjParams.composePageUrl(theContainer.getP=
ageID()) %>");
=
- <% jParams.setCacheStatus(savedCacheStatus);
+ <% jParams.setCacheStatus(savedCacheStatus);
}
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo=
rkflow/adv_workflow.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp&rev=3D1=
7778&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/webapp/jsp/jahia/engines/workflow=
/adv_workflow.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/adv_workflow.jsp Tue Jun 26 16:10:10 2007
@@ -195,6 +195,10 @@
document.mainForm.action =3D "<%=3DengineUrl%>" + "?screen=3D" + p=
aram;
teleportCaptainFlam(document.mainForm);
}
+
+ function refreshTree() {
+ handleActionChanges('display&display=3D<%=3DactiveTabOption%>&obj=
=3D<%=3DentryPoint%>');
+ }
</script>
=
<ul>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo=
rkflow/showReport.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp&rev=3D177=
78&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/webapp/jsp/jahia/engines/workflow=
/showReport.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/showReport.jsp Tue Jun 26 16:10:10 2007
@@ -15,12 +15,13 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%>
-<%@ page import=3D"org.jahia.content.NodeOperationResult" %>
+<%@ page import=3D"org.jahia.data.JahiaData" %>
<%@ page import=3D"org.jahia.engines.EngineMessage" %>
<%@ page import=3D"org.jahia.exceptions.JahiaException" %>
<%@ page import=3D"org.jahia.params.ParamBean" %>
<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
+<%@ page import=3D"org.jahia.services.containers.ContentContainer" %>
<%@ page import=3D"org.jahia.services.fields.URLIntegrityValidForActivatio=
nResults" %>
<%@ page import=3D"org.jahia.services.fields.WAIValidForActivationResults"=
%>
<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
@@ -30,13 +31,16 @@
<%@ page import=3D"java.io.IOException" %>
<%@ page import=3D"java.text.MessageFormat" %>
<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.content.*" %>
+<%@ page import=3D"org.jahia.services.fields.ContentField" %>
+<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page contentType=3D"text/html;charset=3DUTF-8" language=3D"java" %>
=
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%!
public String displayActivationResult(final Object testResultObject,
- final ParamBean jParams,
+ final JahiaData jData,
final String key)
throws IOException, JahiaException, ClassNotFoundException {
final StringBuffer buff =3D new StringBuffer();
@@ -44,6 +48,7 @@
if (objectClass =3D=3D IsValidForActivationResults.class ||
objectClass =3D=3D URLIntegrityValidForActivationResults.c=
lass ||
objectClass =3D=3D WAIValidForActivationResults.class) {
+ final ParamBean jParams =3D jData.params();
final NodeOperationResult ivfar =3D (NodeOperationResult) test=
ResultObject;
final Locale loc =3D LanguageCodeConverters.languageCodeToLoca=
le(ivfar.getLanguageCode());
final EngineMessage message =3D ivfar.getMsg();
@@ -62,6 +67,50 @@
jParams, jParams.getLocale()));
buff.append(": '<b>").append(loc.getDisplayLanguage(jParams.ge=
tLocale()));
buff.append("</b>': ").append(msg);
+ buff.append(" ");
+ final ObjectKey objKey =3D ivfar.getNodeKey();
+ final ContentObject obj =3D (ContentObject) ContentObject.getI=
nstance(objKey);
+ if (obj !=3D null /* && obj.checkWriteAccess(jParams.getUser()=
) */) {
+ if (ivfar.getObjectType().equals(ContentFieldKey.FIELD_TYP=
E)) {
+ final String updateLabel =3D JahiaResourceBundle.getEn=
gineResource("org.jahia.engines.updatefiled.UpdateField_Engine.updateField.=
label",
+ jParams, jParams.getLocale());
+ buff.append("<a href=3D\"javascript:");
+ buff.append(jData.gui().html().drawUpdateFieldLauncher=
((ContentField) obj));
+ buff.append("\"><img border=3D\"0\" src=3D\"");
+ buff.append(jParams.getContextPath());
+ buff.append("/jsp/jahia/engines/images/actions/update.=
gif\" alt=3D\" ");
+ buff.append(updateLabel);
+ buff.append("\" title=3D\"");
+ buff.append(updateLabel);
+ buff.append("\"/></a>");
+
+ } else if (ivfar.getObjectType().equals(ContentContainerKe=
y.CONTAINER_TYPE)) {
+ final String updateLabel =3D JahiaResourceBundle.getEn=
gineResource("org.jahia.engines.title.UpdateContainer",
+ jParams, jParams.getLocale());
+ buff.append("<a href=3D\"javascript:");
+ buff.append(jData.gui().html().drawUpdateContainerLaun=
cher((ContentContainer) obj));
+ buff.append("\"><img border=3D\"0\" src=3D\"");
+ buff.append(jParams.getContextPath());
+ buff.append("/jsp/jahia/engines/images/actions/update.=
gif\" alt=3D\" ");
+ buff.append(updateLabel);
+ buff.append("\" title=3D\"");
+ buff.append(updateLabel);
+ buff.append("\"/></a>");
+
+ } else if (ivfar.getObjectType().equals(ContentPageKey.PAG=
E_TYPE)) {
+ final String updateLabel =3D JahiaResourceBundle.getEn=
gineResource("org.jahia.engines.title.UpdateContainer",
+ jParams, jParams.getLocale());
+ buff.append("<a href=3D\"javascript:");
+ buff.append(jData.gui().html().drawPagePropertiesLaunc=
her((ContentPage) obj));
+ buff.append("\"><img border=3D\"0\" src=3D\"");
+ buff.append(jParams.getContextPath());
+ buff.append("/jsp/jahia/engines/images/actions/update.=
gif\" alt=3D\" ");
+ buff.append(updateLabel);
+ buff.append("\" title=3D\"");
+ buff.append(updateLabel);
+ buff.append("\"/></a>");
+ }
+ }
=
} else {
buff.append(testResultObject.toString());
@@ -73,9 +122,16 @@
<%
final String key =3D request.getParameter("objectkey");
final ActivationTestResults results =3D (ActivationTestResults) reques=
t.getSession().getAttribute(key);
+ final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
%>
=
+<script type=3D"text/javascript">
+ window.onunload =3D function () {
+ window.opener.refreshTree(); =
+ }
+</script>
+
<h3 class=3D"wflowreport">
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.workflow.WorkflowEngine.work=
flowreport.label"/>
@@ -83,7 +139,7 @@
=
<div id=3D"buttons">
<div class=3D"button">
- <a href=3D"javascript:window.close();"
+ <a href=3D"javascript:window.opener.refreshTree();window.close();"
title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
close.button"/>">
<jahia:engineResourceBundle resourceName=3D"org.jahia.close.bu=
tton"/>
</a>
@@ -122,7 +178,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
<% } %>
</ul>
<% } %>
@@ -138,7 +194,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
=
<% } %>
</ul>
@@ -154,7 +210,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
<% } %>
</ul>
<% } %>
@@ -189,7 +245,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
=
<% } %>
</ul>
@@ -206,7 +262,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
=
<% } %>
</ul>
@@ -222,7 +278,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
=
<% } %>
</ul>
@@ -245,7 +301,7 @@
final Object testResultObject =3D iterator.next();
=
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
=
<% } %>
</ul>
@@ -265,7 +321,7 @@
while (iterator.hasNext()) {
final Object testResultObject =3D iterator.next();
%>
- <li><%=3DdisplayActivationResult(testResultObject, jParams, key)%></li>
+ <li><%=3DdisplayActivationResult(testResultObject, jData, key)%></li>
<% } %>
</ul>
<% } %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
