tdraier 2005/06/09 17:17:43 CEST
Modified files:
core/src/conf/java JahiaEnginesResources.properties
core/src/java/org/jahia/content ContentObject.java
core/src/java/org/jahia/engines/addcontainer
AddContainer_Engine.java
core/src/java/org/jahia/engines/importexport
ManageImportExport.java
core/src/webapp/WEB-INF/etc/config listeners.registry
core/src/webapp/jsp/jahia/engines/addcontainer
addcontainer.jsp
core/src/webapp/jsp/jahia/engines/importexport import.jsp
core/src/webapp/jsp/jahia/engines/include actions_selector.jsp
Added files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
added simple content picker, cleaned import/export engine
Revision Changes Path
1.13 +1 -0 jahia/core/src/conf/java/JahiaEnginesResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaEnginesResources.properties.diff?r1=1.12&r2=1.13&f=h
1.12 +13 -0 jahia/core/src/java/org/jahia/content/ContentObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentObject.java.diff?r1=1.11&r2=1.12&f=h
1.7 +8 -1
jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java.diff?r1=1.6&r2=1.7&f=h
1.1 +195 -0
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java?rev=1.1&content-type=text/plain
1.4 +2 -22
jahia/core/src/java/org/jahia/engines/importexport/ManageImportExport.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageImportExport.java.diff?r1=1.3&r2=1.4&f=h
1.8 +2 -0
jahia/core/src/webapp/WEB-INF/etc/config/listeners.registry
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/listeners.registry.diff?r1=1.7&r2=1.8&f=h
1.5 +4 -0
jahia/core/src/webapp/jsp/jahia/engines/addcontainer/addcontainer.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/addcontainer/addcontainer.jsp.diff?r1=1.4&r2=1.5&f=h
1.1 +102 -0
jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp?rev=1.1&content-type=text/plain
1.3 +2 -7
jahia/core/src/webapp/jsp/jahia/engines/importexport/import.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/import.jsp.diff?r1=1.2&r2=1.3&f=h
1.5 +8 -0
jahia/core/src/webapp/jsp/jahia/engines/include/actions_selector.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/include/actions_selector.jsp.diff?r1=1.4&r2=1.5&f=h
Index: JahiaEnginesResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaEnginesResources.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JahiaEnginesResources.properties 21 Apr 2005 08:05:46 -0000 1.12
+++ JahiaEnginesResources.properties 9 Jun 2005 15:17:40 -0000 1.13
@@ -664,6 +664,7 @@
org.jahia.engines.include.actionSelector.Categories.label
= Categories
org.jahia.engines.include.actionSelector.Workflow.label
= Publication workflow
org.jahia.engines.include.actionSelector.ImportExport.label
= Import/Export
+org.jahia.engines.include.actionSelector.ContentPick.label
= Content Pick
org.jahia.engines.login.Login_Engine.invalidUsernamePassword.label
= Invalid username/password or the
authentification service is currently not available
org.jahia.engines.login.Login_Engine.jumpToHomePage.label
= Jump to personal Home page
org.jahia.engines.login.Login_Engine.notAllowedToLog.label
= You are not allowed to log in on this page.
Index: ContentObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentObject.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ContentObject.java 4 May 2005 16:44:26 -0000 1.11
+++ ContentObject.java 9 Jun 2005 15:17:41 -0000 1.12
@@ -1362,6 +1362,19 @@
return set;
}
+ public ContentObject getPickedObject() throws JahiaException {
+ ArrayList links =
ObjectLinkDB.getInstance().findByTypeAndRightObjectKey(
+ StructuralRelationship.PICKER_LINK,this.getObjectKey());
+ for ( int i=0 ; i<links.size(); i++ ){
+ ObjectLink link = (ObjectLink)links.get(i);
+ try {
+ return (ContentObject)
ContentObject.getInstance(link.getLeftObjectKey());
+ } catch (Throwable t) {
+ logger.debug(t);
+ }
+ }
+ return null;
+ }
/**
* Instance generator. Build an instance of the appropriate
Index: AddContainer_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AddContainer_Engine.java 17 May 2005 12:39:07 -0000 1.6
+++ AddContainer_Engine.java 9 Jun 2005 15:17:42 -0000 1.7
@@ -41,6 +41,7 @@
import org.jahia.engines.validation.ValidationErrorSorter;
import org.jahia.engines.validation.ValidationError;
import org.jahia.engines.importexport.ManageImportExport;
+import org.jahia.engines.importexport.ManageContentPicker;
import org.jahia.engines.categories.ManageCategories;
import org.jahia.engines.lock.LockEngine;
import org.jahia.engines.metadata.Metadata_Engine;
@@ -180,10 +181,11 @@
engineMap.put ("writeAccess", Boolean.TRUE);
//engineMap.put ("enableAdvancedWorkflow", Boolean.TRUE);
engineMap.put("enableImportExport", Boolean.TRUE);
-
+ engineMap.put("enableContentPick", Boolean.TRUE);
} else if (theContainerList.checkWriteAccess (theUser)) {
engineMap.put ("writeAccess", Boolean.TRUE);
engineMap.put("enableImportExport", Boolean.TRUE);
+ engineMap.put("enableContentPick", Boolean.TRUE);
}
} else {
JahiaPage thePage = jParams.getPage ();
@@ -453,6 +455,11 @@
engineMap, ServicesRegistry.getInstance ().
getJahiaContainersService().
loadContainerListInfo (theContainer.getListID
()).getContentContainerList());
+ } else if (theScreen.equals("contentPick")) {
+ ManageContentPicker.getInstance ().handleActions (jParams, mode,
+ engineMap, ServicesRegistry.getInstance ().
+ getJahiaContainersService().
+ loadContainerListInfo (theContainer.getListID
()).getContentContainerList());
} else if (theScreen.equals ("save")) { //||
theScreen.equals("apply")) {
logger.debug ("processCurrentScreen > we are in save Mode");
Index: ManageContentPicker.java
====================================================================
package org.jahia.engines.importexport;
import org.jahia.content.ContentObject;
import org.jahia.content.ContentObjectKey;
import org.jahia.content.ContainerDefinitionKey;
import org.jahia.engines.JahiaEngine;
import org.jahia.engines.workflow.ManageWorkflow;
import org.jahia.engines.users.SelectUG_Engine;
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaSessionExpirationException;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.usermanager.JahiaGroup;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.workflow.ExternalWorkflow;
import org.jahia.services.workflow.WorkflowService;
import org.jahia.services.importexport.ImportExportBaseService;
import org.jahia.services.importexport.ImportExportService;
import org.jahia.services.importexport.LinkObjectListener;
import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.webdav.JahiaWebdavBaseService;
import org.jahia.services.webdav.DAVFileAccess;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.search.JahiaSearchService;
import org.jahia.services.search.ContainerSearchResultBuilderImpl;
import org.jahia.services.search.JahiaSearchResultBuilder;
import org.jahia.services.search.SearchResult;
import org.jahia.services.containers.ContentContainer;
import org.jahia.services.containers.ContentContainerList;
import org.jahia.utils.LanguageCodeConverters;
import org.jahia.tools.files.FileUpload;
import org.jahia.bin.Jahia;
import org.jahia.data.search.JahiaSearchResult;
import org.jahia.data.search.JahiaSearchHit;
import org.jahia.data.search.JahiaContainerSearchHit;
import org.jahia.data.containers.JahiaContainerDefinition;
import org.w3c.dom.Document;
import org.apache.xml.serialize.XMLSerializer;
import org.apache.xml.serialize.OutputFormat;
import org.apache.xerces.parsers.DOMParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.*;
import java.io.*;
/**
*
*
* Created by IntelliJ IDEA.
* Date: Nov 20, 2003
* Copyright Codeva 2003
* @author Thomas Draier
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(ManageContentPicker.class);
private static ManageContentPicker instance = null;
private static final String JSP =
"/jsp/jahia/engines/importexport/contentpick.jsp";
/**
* @return a single instance of the object
*/
public static synchronized ManageContentPicker getInstance()
{
if (instance == null) {
instance = new ManageContentPicker();
}
return instance;
}
public boolean handleActions (ParamBean jParams, int mode, HashMap
engineMap, ContentObject object)
throws JahiaException, JahiaSessionExpirationException {
switch (mode) {
case (JahiaEngine.LOAD_MODE) :
return load(jParams, engineMap, object);
case (JahiaEngine.UPDATE_MODE) :
return update( jParams, engineMap, object );
case (JahiaEngine.SAVE_MODE) :
return save( jParams, engineMap, object );
}
return false;
}
public boolean load (ParamBean jParams, HashMap engineMap, ContentObject
object)
throws JahiaException, JahiaSessionExpirationException {
System.out.println("*******************************************************************
LOAD");
ArrayList langs = new ArrayList();
langs.add(jParams.getLocale().toString());
if (jParams.getParameter("search") != null) {
try {
JahiaSearchService s =
ServicesRegistry.getInstance().getJahiaSearchService();
JahiaSearchResultBuilder rb = new
ContainerSearchResultBuilderImpl();
JahiaSearchResult searchResults =
s.search(jParams.getSiteID(), jParams.getParameter("search"), jParams, langs,
rb);
if (searchResults == null) {
searchResults = new JahiaSearchResult(rb);
}
JahiaSearchResult myResults = new JahiaSearchResult(rb);
Map results = new HashMap();
for (Iterator iterator = searchResults.results().iterator();
iterator.hasNext();) {
JahiaSearchHit jahiaSearchHit = (JahiaSearchHit)
iterator.next();
ContentObject current =
ContentContainer.getContainer(Integer.parseInt(jahiaSearchHit.getId()));
int thisCd =
((ContentContainerList)object).getDefinitionID(null);
while (current != null) {
if (current.getPickedObject() != null) {
break;
}
if (current instanceof ContentContainer) {
int cd =
((ContentContainer)current).getDefinitionID(null);
if (cd == thisCd) {
String key =
Integer.toString(current.getID());
if (results.containsKey(key)) {
JahiaContainerSearchHit hit =
(JahiaContainerSearchHit) results.get(key);
hit.setScore( jahiaSearchHit.getScore() +
hit.getScore() );
hit.setTeaser( hit.getTeaser() + ",
"+jahiaSearchHit.getTeaser());
} else {
JahiaContainerSearchHit hit = new
JahiaContainerSearchHit(jahiaSearchHit.getParsedObject());
hit.setId(key);
hit.setPage(((ContentContainer)current).getPage().getPage(jParams));
hit.setPageId(((ContentContainer)current).getPageID());
hit.setTeaser(jahiaSearchHit.getTeaser());
hit.setScore(jahiaSearchHit.getScore());
while (current != null) {
current = current.getParent(null);
if (current != null &&
current.getPickedObject() != null) {
break;
}
}
results.put(key, hit);
break;
}
}
}
current = current.getParent(null);
}
}
for (Iterator iterator = new
TreeSet(results.values()).iterator(); iterator.hasNext();) {
JahiaSearchHit jahiaSearchHit = (JahiaSearchHit)
iterator.next();
myResults.addHit(jahiaSearchHit);
}
engineMap.put ("searchResults", myResults);
if (engineMap.get ("searchResultFrom") == null) {
engineMap.put ("searchResultFrom", new Integer (1));
}
} catch (JahiaException e) {
e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
}
}
if (jParams.getParameter("containerId")!= null &&
jParams.getParameter("containerId").length()>0) {
System.out.println("------------------------> "+
jParams.getParameter("containerId"));
try {
ContentObject source =
ContentContainer.getContainer(Integer.parseInt(jParams.getParameter("containerId")));
new LinkObjectListener().linkedCopy(source, object, new
HashSet(langs), jParams);
} catch (JahiaException e) {
e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
} catch (NumberFormatException e) {
e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
}
}
engineMap.put("fieldsEditCallingEngineName","contentpick_engine");
engineMap.put("contentpick_engine.fieldForm",
ServicesRegistry.getInstance ().
getJahiaFetcherService().fetchServlet(jParams, JSP));
return true;
}
public boolean update (ParamBean jParams, HashMap engineMap,
ContentObject object)
throws JahiaException, JahiaSessionExpirationException {
System.out.println("*****************************************************
UPDATE");
return true;
}
private boolean save( ParamBean jParams, HashMap engineMap, ContentObject
object)
throws JahiaException {
System.out.println("*****************************************************
SAVE");
return true;
}
}
Index: ManageImportExport.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageImportExport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManageImportExport.java 4 May 2005 16:44:26 -0000 1.3
+++ ManageImportExport.java 9 Jun 2005 15:17:42 -0000 1.4
@@ -118,26 +118,6 @@
}
engineMap.put("importexport_engine.fieldForm",
ServicesRegistry.getInstance ().
getJahiaFetcherService().fetchServlet(jParams,
JSP_CLOSE_FILE));
- } else if ("link".equals(jParams.getParameter("operation"))) {
- if (jParams.getParameter("key") != null) {
- try {
- ContentObjectKey key = (ContentObjectKey)
ContentObjectKey.getInstance(jParams.getParameter("key"));
- ContentObject source = (ContentObject)
ContentObject.getInstance(key);
- new LinkObjectListener().linkedCopy(source, object,
languageCodes, jParams);
- } catch (Exception e) {
- throw new JahiaException("Cannot import",
- "Cannot import",
- JahiaException.SERVICE_ERROR,
- JahiaException.ERROR_SEVERITY,
- e);
- }
- engineMap.put("importexport_engine.fieldForm",
ServicesRegistry.getInstance ().
- getJahiaFetcherService().fetchServlet(jParams,
JSP_CLOSE_FILE));
- } else {
- engineMap.put("importexport_engine.fieldForm",
ServicesRegistry.getInstance ().
- getJahiaFetcherService().fetchServlet(jParams,
JSP_IMPORT_FILE));
- }
-
} else {
engineMap.put("importexport_engine.fieldForm",
ServicesRegistry.getInstance ().
getJahiaFetcherService().fetchServlet(jParams,
JSP_IMPORT_FILE));
@@ -147,7 +127,7 @@
if ("complete".equals(jParams.getParameter("operation"))) {
try {
Document doc = ie.export(object, languageCodes,
jParams, true);
- ie.export(object, languageCodes, "/tmp", jParams,
true );
+ ie.export(object, languageCodes, ".", jParams, true
);
StringWriter sw = new StringWriter();
XMLSerializer xmls = new XMLSerializer(sw,new
OutputFormat("method","UTF-8",true));
try {
@@ -157,7 +137,7 @@
// Cannot happen in a stringwriter
}
engineMap.put (JahiaEngine.ENGINE_OUTPUT_FILE_PARAM,
JSP_XML_FILE);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace(); //To change body of catch
statement use File | Settings | File Templates.
}
} else if ("diff".equals(jParams.getParameter("operation")))
{
Index: listeners.registry
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/listeners.registry,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- listeners.registry 29 Apr 2005 14:20:03 -0000 1.7
+++ listeners.registry 9 Jun 2005 15:17:42 -0000 1.8
@@ -27,3 +27,5 @@
# CMS objects.
#
CMSSlideContentListener=org.jahia.services.webdav.listeners.CMSSlideContentListener
+
+LinkObjectListener=org.jahia.services.importexport.LinkObjectListener
Index: addcontainer.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/addcontainer/addcontainer.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- addcontainer.jsp 17 May 2005 12:41:54 -0000 1.4
+++ addcontainer.jsp 9 Jun 2005 15:17:42 -0000 1.5
@@ -125,6 +125,10 @@
<td width="100%" valign="top" class="input">
<%=fieldForm%>
</td>
+<% } else if (theScreen.equals("contentPick")) { %>
+ <td width="100%" valign="top" class="input">
+ <%=fieldForm%>
+ </td>
<% } %>
</tr>
<input type="hidden" name="lastscreen" value="<%=theScreen%>">
Index: contentpick.jsp
====================================================================
<%@ page import="org.jahia.data.search.JahiaSearchHit,
org.jahia.data.search.JahiaSearchResult,
java.util.HashMap,
org.jahia.params.ParamBean"%>content pick
<SCRIPT TYPE="text/javascript">
<!--
function submitenter(myfield,e)
{
var keycode;
if (window.event) keycode = window.event.keyCode;
else if (e) keycode = e.which;
else return true;
if (keycode == 13)
{
handleActionChange('contentPick');
return false;
}
else
return true;
}
//-->
</SCRIPT>
<%
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
String search = "";
if (jParams.getParameter("search") != null) {
search = jParams.getParameter("search");
}
%>
<input type="text" name="search" value="<%= search %>" onKeyPress="return
submitenter(this,event)">
<input type="hidden" name="containerId" />
<input type="hidden" name="screen" value="contentPick" />
<%
JahiaSearchResult searchResults = (JahiaSearchResult) engineMap.get(
"searchResults" );
if (searchResults != null) {
String searchString = (String) engineMap.get ("searchString");
Integer searchResultFrom = (Integer)engineMap.get
("searchResultFrom");
Integer searchShow = (Integer)engineMap.get ("searchShow");
if (searchShow == null) searchShow = new Integer(10);
Integer searchResultTo = null;
if (searchResultFrom.intValue() + searchShow.intValue() >
searchResults.results().size()) {
searchResultTo = new Integer(searchResults.results().size());
} else {
searchResultTo = new Integer(searchResultFrom.intValue() +
searchShow.intValue()-1);
}
String searchNextUrl = (String) engineMap.get( "searchNextUrl" );
String searchPrevUrl = (String) engineMap.get( "searchPrevUrl" );
%>
<table width="100%" border="0" cellspacing="0" cellpadding="5">
<%if (searchResults.results().size() !=0) { %>
<tr>
<td colspan="3" class="text"><br> Displaying documents
<%=searchResultFrom.intValue()%>-<%=searchResultTo.intValue()%> of
<span
class="text4"><%=searchResults.results().size()%></span>, with best matches
first.
<br><br>
</td>
</tr>
<%
if ((searchResults != null) &&
(searchResults.results().size() != 0)) {
for (int i=searchResultFrom.intValue()-1;
i<searchResultTo.intValue(); i++) {
JahiaSearchHit thisHit =
(JahiaSearchHit)searchResults.results().elementAt(i); %>
<tr>
<td> </td>
<td class="text" width="14" valign="top"
align="center">
</td>
<td class="text" width="100%">
<b><%=thisHit.getTeaser()%></b> - score :
<%=thisHit.getScore()%><br>
<b><a
href="<%=jParams.composePageUrl(thisHit.getPageId())%>"
target="preview">Preview</a></b>
<b><a
href="javascript:mainForm.containerId.value='<%= thisHit.getId()
%>';handleActionChange('contentPick')">Select</a></b>
</td>
</tr>
<% }
} %>
<tr>
<td class="text" width="100%" colspan="3" align="center">
<b>
<% if (searchResultFrom.intValue()>1) { %>
[<a
href="<%=searchPrevUrl%>&show=<%=searchShow%>">Previous results</a>]
<% } %>
<% if
(searchResultTo.intValue()<searchResults.results().size()) {%>
[<a
href="<%=searchNextUrl%>&show=<%=searchShow%>">Next results</a>]
<% } %><br>
</b><br><br>
</td>
</tr>
<% } else { %>
<td width="100%" colspan="3" class="text">
<br> <b>Your search did not match any
document.</b><br><br>
</td>
<%}%>
</table>
<%
}
%>
Index: import.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/import.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.jsp 4 May 2005 16:44:29 -0000 1.2
+++ import.jsp 9 Jun 2005 15:17:43 -0000 1.3
@@ -35,6 +35,7 @@
<%--<script language="javascript">--%>
<%-- document.mainForm.enctype="multipart/form-data";--%>
<%--</script>--%>
+ <input type="hidden" name="operation" value="import"/>
<table border="0" width="90%">
<tr>
@@ -52,19 +53,13 @@
<table>
<tr>
<td class="text" align="left"
colspan="2">
- <b>Please, select the task to
perform.</b>
+ <b>Paste xml to import</b>
<br><br><br>
- <b>Available tasks : </b>
-
- <br><br>
</td>
</tr>
<tr>
<td> </td>
<td class="text" align="left" nowrap>
- <input type="radio"
class="input" name="operation" value="link">Link<br><br>
- <input name="key"/>
- <input type="radio"
class="input" name="operation" value="import">Direct import<br><br>
<textarea name="import" cols="60"
rows="8"></textarea>
</td>
</tr>
Index: actions_selector.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/include/actions_selector.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- actions_selector.jsp 17 Dec 2004 16:09:18 -0000 1.4
+++ actions_selector.jsp 9 Jun 2005 15:17:43 -0000 1.5
@@ -18,6 +18,11 @@
doAddEditViewRight = new Boolean(false);
}
+ Boolean enableContentPick = (Boolean)engineMap.get("enableContentPick");
+ if (enableContentPick == null) {
+ enableContentPick = new Boolean(false);
+ }
+
Boolean enableMetadata = (Boolean)engineMap.get("enableMetadata");
if (enableMetadata == null) {
enableMetadata = new Boolean(false);
@@ -122,6 +127,9 @@
<jahia:tabButtonsList>
<jahia:tabButton label="Authoring"
labelKey="org.jahia.engines.include.actionSelector.Authoring.label"
url="javascript:handleActionChange('edit')"
isSelected='<%=theScreen.equals("edit")?"true":"false" %>' />
<jahia:tabButton label="Metadata Mgmt"
labelKey="org.jahia.engines.include.actionSelector.Metadata.label"
url="javascript:handleActionChange('metadata')"
isSelected='<%=theScreen.equals("metadata")?"true":"false" %>' />
+ <% if (enableContentPick.booleanValue()) { %>
+ <jahia:tabButton label="Content Pick"
labelKey="org.jahia.engines.include.actionSelector.ContentPick.label"
url="javascript:handleActionChange('contentPick')"
isSelected='<%=theScreen.equals("contentPick")?"true":"false" %>' />
+ <% } %>
<% if (enableRightView.booleanValue() &&
adminAccess.booleanValue()){ %>
<jahia:tabButton label="Rights Mgmt"
labelKey="org.jahia.engines.include.actionSelector.RightsMgmt.label"
url="javascript:handleActionChange('rightsMgmt')"
isSelected='<%=theScreen.equals("rightsMgmt")?"true":"false" %>' />
<% } %>
