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

Merged V4.1-BUG-FIX to HEAD

Browse Source 
40484: ALF-15370: 'New Rule' page localisation breaks after any rule was created in Japanese
   40487: Merged BRANCHES/V4.1 to BRANCHES/DEV/4.1-BUG-FIX:
      40485: ALF-15453: Incorrect manage permissions working for a file/folder
   40490: ALF-15455: Pass through windows specific environment variables (will not be set on unix) to make ImageMagick work on Windows with Bitrock layout
   40492: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX
      40491: ALF-7803 : Tomcat 7??? "Submit Items" page isn't opened
             The duplicate cellpadding attibutes were removed from jsp.
   40495: Final part of achievable fix for ALF-12803 - No user feedback: Cannot transformed content with password. (Failure of synchronous rule causes upload to fail with unhelpful message)
    - cleaned up flash error message - but see comments on ALF-12803 for full resolution
   40522: ALF-12839 Share - Inconsistency in adding a user or a group into a group
   40525: ALF-12839 Share - Inconsistency in adding a user or a group into a group
      - fix unit test by adding the * added by javascript code
   40535: ALF-15455: Another attempt
   - Properly escape global variables so bitrock doesn't try to expand them
   - Force backslash paths on windows
   40539: ALF-15455: ImageMagick still not working on Windows because env variable setting was losing the system PATH
   - Did it ever work before?
   - Now, if variables are specified, the PATH is propagated from the parent environment. If a PATH is specified, it is prepended to the parent PATH.
   40554: New Russian translations from Gloria plus Bitrock configuration to enable them
   40559: ALF-15506: When deleting a file from the actions menu a message was not shown to indicate that the folder is being deleted.
   40590: ALF-15318: It was possible for a user with a disabled / expired account to log in via NTLM/SSO
   40591: Merged V4.1 to V4.1-BUG-FIX
      40485: ALF-15453: Incorrect manage pernissions working for a file/folder
      40545: Fixes a bug in the visibility of the Cloud Sync settings page on the user profile.
   40592: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY)
      40478: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/V4.1
         40153: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
         40361: ALF-15453: Incorrect manage permissions working for a file/folder
      40481: Merge issue in r40478 fixed
   40593: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40503: Fix for ALF-14832 - Search by Tags is not working in WCMQS site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-08-19 14:12:51 +00:00
parent 9c46a39cf9
commit 1bcc2c4639
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/web/scripts/site/SiteMembershipsGet.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2012 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -60,6 +60,10 @@ public class SiteMembershipsGet extends AbstractSiteWebScript
{ {
// Grab out filters // Grab out filters
String nameFilter = req.getParameter("nf"); String nameFilter = req.getParameter("nf");
if (nameFilter!=null)
{
nameFilter = nameFilter.endsWith("*") ? nameFilter : nameFilter+"*";
}
String roleFilter = req.getParameter("rf"); String roleFilter = req.getParameter("rf");
String authorityType = req.getParameter("authorityType"); String authorityType = req.getParameter("authorityType");
String sizeS = req.getParameter("size"); String sizeS = req.getParameter("size");