projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ff9877
)
Adapt CMS Web to new assembly approach.
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 27 Nov 2019 20:32:20 +0000
(21:32 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 27 Nov 2019 20:32:20 +0000
(21:32 +0100)
org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
patch
|
blob
|
history
org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
patch
|
blob
|
history
org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
patch
|
blob
|
history
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
index 529061e92f0f96229a646cae83a9d7057140adb8..2cd86ce08edc115300b1e9cda9d0309b4d8626bc 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
@@
-328,7
+328,7
@@
public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
private String publishMetaData(Node node) throws RepositoryException {
// Title
String title;
private String publishMetaData(Node node) throws RepositoryException {
// Title
String title;
- if (node
!=
null && node.isNodeType(NodeType.MIX_TITLE) && node.hasProperty(Property.JCR_TITLE))
+ if (node
!=
null && node.isNodeType(NodeType.MIX_TITLE) && node.hasProperty(Property.JCR_TITLE))
title = node.getProperty(Property.JCR_TITLE).getString() + " - " + getBaseTitle();
else
title = getBaseTitle();
title = node.getProperty(Property.JCR_TITLE).getString() + " - " + getBaseTitle();
else
title = getBaseTitle();
@@
-338,6
+338,8
@@
public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
return null;
StringBuilder js = new StringBuilder();
return null;
StringBuilder js = new StringBuilder();
+ if (title == null)
+ title = "";
title = title.replace("'", "\\'");// sanitize
js.append("document.title = '" + title + "';");
jsExecutor.execute(js.toString());
title = title.replace("'", "\\'");// sanitize
js.append("document.title = '" + title + "';");
jsExecutor.execute(js.toString());
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
index faf01182b82c4d66ea1210b3ea88d5a378c5cacf..b18770f189f3959db89684938580aeb60da7009d 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
@@
-85,7
+85,7
@@
public class CmsLink implements CmsUiProvider {
// + " Make sure bundleContext property is set and init() method has been called.");
// }
// + " Make sure bundleContext property is set and init() method has been called.");
// }
- Composite comp = new Composite(parent, SWT.
BOTTOM
);
+ Composite comp = new Composite(parent, SWT.
NONE
);
comp.setLayout(CmsUtils.noSpaceGridLayout());
Label link = new Label(comp, SWT.NONE);
comp.setLayout(CmsUtils.noSpaceGridLayout());
Label link = new Label(comp, SWT.NONE);
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
index 5b0e1b779cf991ea41cb213cb7b120e893d1419b..327438b56c58b04690fa5321bf644756d93ed472 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
@@
-26,6
+26,7
@@
import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ui.LifeCycleUiProvider;
import org.argeo.jcr.JcrUtils;
import org.argeo.node.NodeConstants;
import org.argeo.cms.ui.LifeCycleUiProvider;
import org.argeo.jcr.JcrUtils;
import org.argeo.node.NodeConstants;
+import org.argeo.node.NodeUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.Application;
import org.eclipse.rap.rwt.application.Application.OperationMode;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.Application;
import org.eclipse.rap.rwt.application.Application.OperationMode;
@@
-147,8
+148,8
@@
public class SimpleApp implements CmsConstants, ApplicationConfiguration {
log.debug("Theme " + themeId);
for (String css : cssLst) {
application.addStyleSheet(themeId, css, styleSheetRL);
log.debug("Theme " + themeId);
for (String css : cssLst) {
application.addStyleSheet(themeId, css, styleSheetRL);
- if (log.is
Trace
Enabled())
- log.
trace
(" CSS " + css);
+ if (log.is
Debug
Enabled())
+ log.
debug
(" CSS " + css);
}
}
}
}
@@
-168,7
+169,8
@@
public class SimpleApp implements CmsConstants, ApplicationConfiguration {
public void init() throws RepositoryException {
Session session = null;
try {
public void init() throws RepositoryException {
Session session = null;
try {
- session = JcrUtils.loginOrCreateWorkspace(repository, workspace);
+ session = NodeUtils.openDataAdminSession(repository, workspace);
+ // session = JcrUtils.loginOrCreateWorkspace(repository, workspace);
VersionManager vm = session.getWorkspace().getVersionManager();
JcrUtils.mkdirs(session, jcrBasePath);
session.save();
VersionManager vm = session.getWorkspace().getVersionManager();
JcrUtils.mkdirs(session, jcrBasePath);
session.save();