Merged V2.1-A to HEAD

8403: Fix for ADB-33
  8586: Fix for ADB-33

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-05-21 09:05:00 +00:00
parent a4937fd9ae
commit c5220e3a96
7 changed files with 137 additions and 5 deletions

View File

@@ -64,6 +64,7 @@ public class ClientConfigElement extends ConfigElementAdapter
private boolean forceAndTerms = false;
private int searchMaxResults = -1;
private int selectorsSearchMaxResults = 500;
private int inviteUsersMaxResults = 500;
private String helpUrl = null;
private String editLinkType = "http";
private String homeSpacePermission = null;
@@ -185,6 +186,11 @@ public class ClientConfigElement extends ConfigElementAdapter
combinedElement.setSelectorsSearchMaxResults(newElement.getSelectorsSearchMaxResults());
}
if (newElement.getInviteUsersMaxResults() != combinedElement.getInviteUsersMaxResults())
{
combinedElement.setInviteUsersMaxResults(newElement.getInviteUsersMaxResults());
}
if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
{
combinedElement.setShelfVisible(newElement.isShelfVisible());
@@ -474,6 +480,29 @@ public class ClientConfigElement extends ConfigElementAdapter
{
this.selectorsSearchMaxResults = selectorsSearchMaxResults;
}
/**
* If positive, this will limit the size of the result set from the
* invite users wizard.
*
* @return The maximum number of results to display
*/
public int getInviteUsersMaxResults()
{
return this.inviteUsersMaxResults;
}
/**
* Set if the the result set from a search for the invite users wizard
* will be of limited size. If negative it is unlimited, by default,
* this is set to 500.
*
* @param inviteUsersMaxResults
*/
/*package*/ void setInviteUsersMaxResults(int inviteUsersMaxResults)
{
this.inviteUsersMaxResults = inviteUsersMaxResults;
}
/**
* @return Returns the default Home Space permissions.