Merged V3.1 to HEAD

13129: Merged V2.1-A to V3.1
      8598: Fix for ADB-41 (ACT 1657)
   13139: Merged V2.1-A to V3.1
      8674: First phase of using group display name in UI
   13148: Merged V2.1-A to V3.1
      8679: Completion of using group display name in UI
   13149: Merged V2.1-A to V3.1
      8690: Fixed ADB-33 again
   13150: Merged V2.1-A to V3.1
      8775: Fix ACT-2399
   13152: Merged V2.1-A to V3.1
      8941: ACT-2631: added max users message to send email action page

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 13:52:31 +00:00
parent 57afebd2cd
commit de9feffb28
14 changed files with 295 additions and 70 deletions

View File

@@ -67,6 +67,7 @@ public class ClientElementReader implements ConfigElementReader
public static final String ELEMENT_BREADCRUMB_MODE = "breadcrumb-mode";
public static final String ELEMENT_CIFSURLSUFFIX = "cifs-url-suffix";
public static final String ELEMENT_LANGUAGESELECT = "language-select";
public static final String ELEMENT_ZEROBYTEFILEUPLOADS = "zero-byte-file-uploads";
/**
@@ -283,6 +284,13 @@ public class ClientElementReader implements ConfigElementReader
{
configElement.setLanguageSelect(Boolean.parseBoolean(langSelect.getTextTrim()));
}
// get the zero byte file upload mode
Element zeroByteFiles = element.element(ELEMENT_ZEROBYTEFILEUPLOADS);
if (zeroByteFiles != null)
{
configElement.setZeroByteFileUploads(Boolean.parseBoolean(zeroByteFiles.getTextTrim()));
}
}
return configElement;