From 97f06f37732baefaf99b295022801b5ef6da0a1e Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 19 Jan 2010 11:33:37 +0000 Subject: [PATCH] Merged V3.2E to HEAD 17460: Refactored calendar views into separate objects 17466: Remote API part of fix for ETHREEOH-3268. - Added simple webscript to return details of the authentication system, such as account creation allowed. 17473: ETHREEOH-3268 - UI part of fix. - Add External Users is now disabled in Share if Alfresco instance does not support creating new users i.e. if LDAP or similar is used. 17479: ETHREEOH-2409 - Doc Library Details page displays incomplete action list; usability issue 17480: My Tasks dashlet - prevent display of fake date used for sorting 17484: Fixed ETHREEOH-2305 "It's impossible to implement a Search request with empty search field in Site Members area." - Default settings can be applied in web-framework-config-application.xml: 1 100 and later be overriden in the properties section for each searchable components binding file. - The components that override the min-search-term-length default value and set it to "0" are: site-finder, site-members & site-groups 17485: Merged DEV_TEMPORARY TO V3.2 17468: Problem rendering field description (MultilingualTextAreaGenerator) for app:folderlink 17486: Merged DEV_TEMPORARY to V3.2 (record-only) 17487: Partial fix for ETHREEOH-3308 (xf:switch cannot be used in repeating field type), fixes 'extra' set of fields seen when using a maxOccurs of more than 1 17489: MERGED DEV/TEMPORARY to V3.2 ETHREEOH-3068 - WCM Create Web Content Wizard 17492: Fix for ETHREEOH-2598 documents uploaded via Share interface are not incremented as versions with CIFS/SMB interface. - Auto versioning of documents now correctly handled via CIFS edit if an appropriate rule is applied to a doclib git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web-client-config-properties.xml | 1 + .../web/bean/wcm/CreateWebContentWizard.java | 6 +- .../web/forms/xforms/Schema2XForms.java | 12 +++- .../web/jsp/content/edit-link-properties.jsp | 55 +++---------------- 4 files changed, 20 insertions(+), 54 deletions(-) diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml index 3aff50eb6b..4e8cb39eea 100644 --- a/config/alfresco/web-client-config-properties.xml +++ b/config/alfresco/web-client-config-properties.xml @@ -155,6 +155,7 @@ + diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java index 03dac5f4cf..40f6c513df 100644 --- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java @@ -80,7 +80,6 @@ import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.component.UIListItem; import org.alfresco.web.ui.wcm.component.UIUserSandboxes; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; @@ -900,10 +899,7 @@ public class CreateWebContentWizard extends CreateContentWizard public String getFormDescriptionAttribute() { - if (StringUtils.isEmpty(this.formDescriptionAttribute)) - { - this.formDescriptionAttribute = buildFormDescriptionAttribute(); - } + this.formDescriptionAttribute = buildFormDescriptionAttribute(); return this.formDescriptionAttribute; } diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java index 5815d61d53..b1cd9f4777 100644 --- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java +++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java @@ -1289,7 +1289,8 @@ public class Schema2XForms implements Serializable elementDecl, compatibleTypes, pathToRoot, - resourceBundle); + resourceBundle, + occurs); } } @@ -1342,7 +1343,8 @@ public class Schema2XForms implements Serializable final XSElementDeclaration elementDecl, final TreeSet compatibleTypes, final String pathToRoot, - final ResourceBundle resourceBundle) + final ResourceBundle resourceBundle, + final SchemaUtil.Occurrence occurs) throws FormBuilderException { // look for compatible types @@ -1364,14 +1366,18 @@ public class Schema2XForms implements Serializable // multiple compatible types for this element exist // in the schema - allow the user to choose from // between compatible non-abstract types + boolean isRepeated = isRepeated(occurs, controlType); Element bindElement = this.createBind(xformsDocument, pathToRoot + "/@xsi:type"); String bindId = bindElement.getAttributeNS(null, "id"); modelSection.appendChild(bindElement); + this.startBindElement(bindElement, schema, controlType, null, occurs); //add the "element" bind, in addition - final Element bindElement2 = this.createBind(xformsDocument, pathToRoot); + final Element bindElement2 = this.createBind(xformsDocument, + pathToRoot + (isRepeated ? "[position() != last()]" : "")); final String bindId2 = bindElement2.getAttributeNS(null, "id"); modelSection.appendChild(bindElement2); + this.startBindElement(bindElement2, schema, controlType, null, occurs); // add content to select1 final Map caseTypes = diff --git a/source/web/jsp/content/edit-link-properties.jsp b/source/web/jsp/content/edit-link-properties.jsp index 3ad55dada7..7752af5fcf 100644 --- a/source/web/jsp/content/edit-link-properties.jsp +++ b/source/web/jsp/content/edit-link-properties.jsp @@ -24,53 +24,16 @@ --%> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - -
: - * -
: - -
: - -
: - -
 \ No newline at end of file