mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.1 to HEAD
13249: Fix for ETHREEOH-1064 and ETHREEOH-1286 and fix for issue where New Page action not activated in Share Wiki page list. 13251: Final part of fix for ETHREEOH-1270 - Group pickers in JSF client now use new findAuthorities() API to find groups for user searches - over 10x quicker for installations with many groups. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -85,6 +85,7 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
private boolean zeroByteFileUploads = true;
|
||||
private boolean userGroupAdmin = true;
|
||||
private boolean allowUserConfig = true;
|
||||
private int pickerSearchMinimum = 2;
|
||||
|
||||
|
||||
/**
|
||||
@@ -281,6 +282,11 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
combinedElement.setUserGroupAdmin(newElement.isUserGroupAdmin());
|
||||
}
|
||||
|
||||
if (newElement.getPickerSearchMinimum() != combinedElement.getPickerSearchMinimum())
|
||||
{
|
||||
combinedElement.setPickerSearchMinimum(newElement.getPickerSearchMinimum());
|
||||
}
|
||||
|
||||
return combinedElement;
|
||||
}
|
||||
|
||||
@@ -810,4 +816,20 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
{
|
||||
this.allowUserConfig = allowUserConfig;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Returns the minimum number of characters for a picker search.
|
||||
*/
|
||||
public int getPickerSearchMinimum()
|
||||
{
|
||||
return this.pickerSearchMinimum;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param searchMinimum The minimum number of characters for a picker search.
|
||||
*/
|
||||
/*package*/ void setPickerSearchMinimum(int searchMinimum)
|
||||
{
|
||||
this.pickerSearchMinimum = searchMinimum;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user