inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
13173: Merged V2.1-A to V3.1
      10964: Fix for ADB-81: String 'Template' in Japanese is not good format
      10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
      10972: Fix for ADB-95: All templates should be parameterized using a  such that they pickup the server name and port number of the current installation
      10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
   13174: Merged V2.1-A to V3.1
      10975: Fix for ADB-118: Content attributes not localized [client templates]
   13182: Merged V2.1-A to V3.1
      11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
      11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
   13190: Merged V2.1-A to V3.1
      11070: Fix for ADB-120 ACT 4773
   13192: Merged V2.1-A to V3.1
      11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
   13193: Merged V2.1-A to V3.1
      8395: Remove user and group admin actions from Admin console [added config switch - off by default]
      8584: Removed option for user to change password [added config switch - off by default]
      10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
      10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
   13194: Merged V2.1-A to V3.1
      12095: Fix for ADB-131
   13195: Merged V2.1-A to V3.1
      12097: Fix for ADB-133, ADB-134
      12102: Fix for ADB-139
   13196: Merged V2.1-A to V3.1
      12350: Fix for ADB-142
   13197: Merged V2.1-A to V3.1
      12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
      12878: Merged record-only for V2.1-A to HEAD 
         12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
   13198: Merged V2.1-A to V3.1
      12977: Fix for ADB-158: Intermittent error while accessing the login page
      13142: Another fix for ADB-158: Intermittent error while accessing the login page
   13199: Merged V2.1-A to V3.1
      11589: Fix for ADB-95: All templates should be parameterized

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 14:45:20 +00:00
parent a07c125fd3
commit 1aa1ef1f13
64 changed files with 493 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/java/org/alfresco/web/config/ClientConfigElement.java
View File

@@ -83,6 +83,8 @@ public class ClientConfigElement extends ConfigElementAdapter
private String cifsURLSuffix;
private boolean languageSelect = true;
private boolean zeroByteFileUploads = true;
private boolean userGroupAdmin = true;
private boolean allowUserConfig = true;
/**
@@ -269,6 +271,16 @@ public class ClientConfigElement extends ConfigElementAdapter
combinedElement.setZeroByteFileUploads(newElement.isZeroByteFileUploads());
}
if (newElement.getAllowUserConfig() != combinedElement.getAllowUserConfig())
{
combinedElement.setAllowUserConfig(newElement.getAllowUserConfig());
}
if (newElement.isUserGroupAdmin() != combinedElement.isUserGroupAdmin())
{
combinedElement.setUserGroupAdmin(newElement.isUserGroupAdmin());
}
return combinedElement;
}
@@ -766,4 +778,36 @@ public class ClientConfigElement extends ConfigElementAdapter
{
this.zeroByteFileUploads = zeroByteFileUploads;
}
/**
* @return true if allowing User Group administration by an admin user
*/
public boolean isUserGroupAdmin()
{
return this.userGroupAdmin;
}
/**
* @param userGroupAdmin true to allow User Group administration by an admin user
*/
/*package*/ void setUserGroupAdmin(boolean userGroupAdmin)
{
this.userGroupAdmin = userGroupAdmin;
}
/**
* @return true to allow users to modify their personal settings in the User Console screen
*/
public boolean getAllowUserConfig()
{
return this.allowUserConfig;
}
/**
* @param allowUserConfig true to allow users to modify their personal settings in the User Console screen
*/
/*package*/ void setAllowUserConfig(boolean allowUserConfig)
{
this.allowUserConfig = allowUserConfig;
}
}