Author: xlawrence
Date: Wed Jun 27 16:36:35 2007
New Revision: 17808
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17808&repname=
=3Djahia
Log:
Backport addition of new launchers for page properties engine
Modified:
trunk/core/src/java/org/jahia/gui/GuiBean.java
trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
Modified: trunk/core/src/java/org/jahia/gui/GuiBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/gui/GuiBean.java&rev=3D17808&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
--- trunk/core/src/java/org/jahia/gui/GuiBean.java (original)
+++ trunk/core/src/java/org/jahia/gui/GuiBean.java Wed Jun 27 16:36:35 2007
@@ -32,6 +32,7 @@
import org.jahia.data.containers.JahiaContainerListPagination;
import org.jahia.data.fields.JahiaField;
import org.jahia.engines.JahiaEngine;
+import org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine;
import org.jahia.engines.containerlistproperties.ContainerListProperties_E=
ngine;
import org.jahia.engines.filemanager.DAVFilemanager_Engine;
import org.jahia.engines.filemanager.TableEntry;
@@ -329,6 +330,16 @@
append("?screen=3Dsave").toString());
}
=
+ /**
+ * @param contentContainer
+ * @return
+ * @throws JahiaException
+ */
+ public String drawRestoreContainerUrl(final ContentContainer contentCo=
ntainer)
+ throws JahiaException {
+ return drawUrlCheckWriteAccess(RestoreLiveContainer_Engine.ENGINE_=
NAME, contentContainer);
+ }
+
public String drawAjaxFileManagerUrl() throws JahiaException {
final StringBuffer buff =3D new StringBuffer();
return drawUrl(DAVFilemanager_Engine.ENGINE_NAME, buff.append("/pi=
d/").append(jParams.getPageID()).
@@ -536,7 +547,6 @@
}
}
=
-
/**
* @param theContainer
* @return
@@ -598,6 +608,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);
@@ -1187,14 +1221,22 @@
}
}
return false;
- } // end isIE5
+ } // end isIE6
+
+ public boolean isIE7(final HttpServletRequest req) {
+ final String userAgent =3D jParams.getUserAgent();
+ if (userAgent !=3D null) {
+ if (userAgent.indexOf("MSIE 7") !=3D -1) {
+ return true;
+ }
+ }
+ return false;
+ } // end isIE7
=
- /***
+ /**
* isOpera
- *
*/
- public boolean isOpera(HttpServletRequest req)
- {
+ public boolean isOpera(HttpServletRequest req) {
String userAgent =3D req.getHeader( "user-agent" );
if (userAgent !=3D null) {
userAgent =3D userAgent.toLowerCase();
Modified: trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/gui/HTMLToolBox.java&rev=3D17808&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
--- trunk/core/src/java/org/jahia/gui/HTMLToolBox.java (original)
+++ trunk/core/src/java/org/jahia/gui/HTMLToolBox.java Wed Jun 27 16:36:35 =
2007
@@ -560,6 +560,31 @@
return out;
}
=
+ /**
+ *
+ */
+ public String drawRestoreContainerLauncher(final ContentContainer cont=
entContainer)
+ throws JahiaException {
+
+ if (contentContainer =3D=3D null) return "";
+ final JahiaUser user =3D jParams.getUser();
+
+ if (!contentContainer.checkWriteAccess(user, false, false)) return=
"";
+
+ final int containerID =3D contentContainer.getID();
+ final StringBuffer name =3D new StringBuffer();
+ name.append("restoreContainer_");
+
+ name.append(containerID);
+ name.append(cleanSessionID(jParams.getSessionID()));
+ final String restoreContainerURL =3D gui.drawRestoreContainerUrl(c=
ontentContainer);
+ final StringBuffer buff =3D new StringBuffer();
+ return restoreContainerURL.equals("") ? "" :
+ buff.append("OpenJahiaScrollableWindow('").append(restoreC=
ontainerURL).
+ append("','").append(name.toString()).append("',").
+ append(790).append(",").append(340).append(")").to=
String();
+ }
+
// --------------------------------------------- drawContainerListProp=
erties
=
/**
@@ -611,7 +636,8 @@
name.append(listID);
=
name.append(cleanSessionID(jParams.getSessionID()));
- final String containerListPropertiesURL =3D gui.drawContainerListP=
ropertiesUrl(contentContainerList);
+ final String containerListPropertiesURL =3D gui.drawContainerListP=
ropertiesUrl(
+ contentContainerList);
String out =3D "";
if (!"".equals(containerListPropertiesURL)) {
final StringBuffer buff =3D new StringBuffer();
@@ -745,24 +771,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
+ */
+ 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) thr=
ows JahiaException {
+ 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
@@ -1021,7 +1068,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().
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
