Introduce CMS DataModel

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / forms / FormPageViewer.java

diff --git a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
index 7460a00fdd30bc854bdaef0cbaaa6b1d8f71f84e..98566485963e8231e6fac23e5caed93b46f40640 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
+++ b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
@@ -121,7 +121,7 @@ public class FormPageViewer extends AbstractPageViewer {
                        // JCR : Model
                        node = ept.getNode();
                        String propName = ept.getPropertyName();
-                       if (FormUtils.notEmpty(txt)) {
+                       if (EclipseUiUtils.isEmpty(txt)) {
                                if (node.hasProperty(propName))
                                        node.getProperty(propName).remove();
                        } else {
@@ -461,8 +461,12 @@ public class FormPageViewer extends AbstractPageViewer {
 
                        if (name == null)
                                name = details.getFileName();
+
+                       // TODO clean image name more carefully
+                       String cleanedName = name.replaceAll("[^a-zA-Z0-9-.]", "_");
+
                        try {
-                               imageManager().uploadImage(context, name, stream);
+                               imageManager().uploadImage(context, cleanedName, stream);
                                // TODO clean refresh strategy
                                section.getDisplay().asyncExec(new Runnable() {
                                        @Override