Merged V2.2 to HEAD

10992: Merged V2.1 to V2.2
    10318: Several WCM UI performance enhancements and UI improvements to enable faster interface refresh.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-09-26 12:25:17 +00:00
parent 4bf32304f1
commit e5e448fc9b
11 changed files with 269 additions and 157 deletions

View File

@@ -82,13 +82,14 @@ public class UpdatePermissionsDialog extends BasePermissionsDialog
*/
protected void createLock(AVMNode node)
{
if (getAvmLockingService().getLock(node.getWebProject().getStoreId(), node.getPath().substring(node.getPath().indexOf("/"))) == null && !node.isDirectory())
String webProject = AVMUtil.getStoreId(AVMUtil.getStoreName(node.getPath()));
if (getAvmLockingService().getLock(webProject, node.getPath().substring(node.getPath().indexOf("/"))) == null && !node.isDirectory())
{
String userName = getAuthenticationService().getCurrentUserName();
List<String> owners = new ArrayList<String>(1);
owners.add(userName);
String webProject = node.getWebProject().getStoreId();
String[] storePath = node.getPath().split(":");
AVMLock lock = new AVMLock(webProject, storePath[0], storePath[1], AVMLockingService.Type.DISCRETIONARY, owners);