xlawrence 2006/01/09 14:29:02 CET
Modified files:
core/src/java/org/jahia/gui HTMLToolBox.java
Log:
added method for the Workflow report screen
Revision Changes Path
1.40 +25 -3 jahia/core/src/java/org/jahia/gui/HTMLToolBox.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java.diff?r1=1.39&r2=1.40&f=h
Index: HTMLToolBox.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- HTMLToolBox.java 15 Dec 2005 16:11:07 -0000 1.39
+++ HTMLToolBox.java 9 Jan 2006 13:29:02 -0000 1.40
@@ -60,7 +60,7 @@
* Modified and cleaned by Xavier Lawrence
* MC modified and cleaned Xavier Lawrence
*
- * @version $Id: HTMLToolBox.java,v 1.39 2005/12/15 16:11:07 dpillot Exp $
+ * @version $Id: HTMLToolBox.java,v 1.40 2006/01/09 13:29:02 xlawrence Exp $
*/
public class HTMLToolBox {
@@ -644,6 +644,26 @@
}
/**
+ *
+ */
+ public String drawShowReportLauncher(final String key) throws
JahiaException {
+ //
javascript:OpenJahiaScrollableWindow('/jahia/Jahia/engineName/workflow/op/edit/pid/1?screen=display&obj=ContentPage_1','workflow_1B6918F79144F548B6229C458B71E690A',950,720)"
+ final StringBuffer buff = new StringBuffer();
+ final StringBuffer name = new StringBuffer();
+ name.append("workflow_");
+ if (jParams.getPage() != null) {
+ name.append(jParams.getPage().getID());
+ }
+ final String workflowURL = jParams.composeEngineUrl("workflow",
"?screen=showReport&objectkey=" + key);
+ name.append(cleanSessionID(jParams.getSessionID()));
+ return ("".equals(workflowURL)) ? "" :
+
buff.append("javascript:OpenJahiaScrollableWindow('").append(workflowURL).
+ append("','").append(name.toString()).append("',").
+
append(JS_WINDOW_WIDTH).append(",").append(JS_WINDOW_HEIGHT).
+ append(");").toString();
+ }
+
+ /**
* @param basePage
* @return smthg
*/
@@ -1306,9 +1326,8 @@
String resource = getResource(resourceBundle, objectType +
"Operations");
//check for special status:picked/picker
- String pickedID = "";
+ String pickedID;
final ContentContainer cc;//the current container
- String pickedpageID="";
ContentObject pickedObject;// the source of the linked copy(the
picked)
try {
cc = ContentContainer.getContainer(objectKey);
@@ -1546,6 +1565,9 @@
}
/**
* $Log: HTMLToolBox.java,v $
+ * Revision 1.40 2006/01/09 13:29:02 xlawrence
+ * added method for the Workflow report screen
+ *
* Revision 1.39 2005/12/15 16:11:07 dpillot
* fix npe on getPickedObject method
*
