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.0 to HEAD

Browse Source 
12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
   12085: ETHREEOH-565: Failure to generate flash preview for PPT file
   12086: ETHREEOH-903 	 Sites drop-down Favorites UI improvements
          ETHREEOH-904 	 My Sites dashlet Favorites UI improvements
          ETHREEOH-547 	 User who is not a site manager can delete sites: my sites dashlet and sites page
   12093: ETHREEOH-861, ETHREEOH-928
   12094: Remove __MACOSX folder that has appeared in Share webapp
   12096: Removed spurious files from YUI 2.6.0 distribution
   12100: ETHREEOH-929   Tightening up transport adapters field (should never be shown for ASR)
   12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
   12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
   12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12115: Added unit test to check for cm:folder-derived type support
   12116: Removed unused, old patch-related query
   12117: Merged V2.2 to V3.0
      11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
   12118: Fixed compilation error after merge
   12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
   12122: UserUsage does nothing if system is READ-ONLY.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-18 17:10:36 +00:00
parent 9f42bfac4c
commit ab4bdfc013
38 changed files with 2011 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/admin/patch/impl/AbstractPermissionChangePatch.java
View File

@@ -27,7 +27,6 @@ package org.alfresco.repo.admin.patch.impl;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.domain.DbPermission;
import org.alfresco.repo.domain.QNameDAO;
import org.alfresco.repo.domain.QNameEntity;
import org.alfresco.repo.domain.hibernate.DbPermissionImpl;
import org.alfresco.service.namespace.QName;
import org.hibernate.Query;
@@ -78,11 +77,11 @@ public abstract class AbstractPermissionChangePatch extends AbstractPatch
/** Helper to get a permission entity */
private static class GetPermissionCallback implements HibernateCallback
{
private QNameEntity typeQNameEntity;
private Long typeQNameId;
private String name;
public GetPermissionCallback(QNameEntity typeQNameEntity, String name)
public GetPermissionCallback(Long typeQNameId, String name)
{
this.typeQNameEntity = typeQNameEntity;
this.typeQNameId = typeQNameId;
this.name = name;
}
public Object doInHibernate(Session session)
@@ -91,7 +90,7 @@ public abstract class AbstractPermissionChangePatch extends AbstractPatch
session.flush();
Query query = session.getNamedQuery(HibernateHelper.QUERY_GET_PERMISSION);
query.setParameter("permissionTypeQName", typeQNameEntity)
query.setLong("permissionTypeQNameId", typeQNameId)
.setString("permissionName", name);
return query.uniqueResult();
}
@@ -120,23 +119,23 @@ public abstract class AbstractPermissionChangePatch extends AbstractPatch
}
// Get the QName entities
QNameEntity oldTypeQNameEntity = qnameDAO.getOrCreateQNameEntity(oldTypeQName);
QNameEntity newTypeQNameEntity = qnameDAO.getOrCreateQNameEntity(newTypeQName);
Long oldTypeQNameId = qnameDAO.getOrCreateQName(oldTypeQName).getFirst();
Long newTypeQNameId = qnameDAO.getOrCreateQName(newTypeQName).getFirst();
HibernateCallback getNewPermissionCallback = new GetPermissionCallback(oldTypeQNameEntity, oldName);
HibernateCallback getNewPermissionCallback = new GetPermissionCallback(oldTypeQNameId, oldName);
DbPermission permission = (DbPermission) getHibernateTemplate().execute(getNewPermissionCallback);
if (permission == null)
{
// create the permission
permission = new DbPermissionImpl();
permission.setTypeQName(newTypeQNameEntity);
permission.setTypeQNameId(newTypeQNameId);
permission.setName(newName);
// save
getHibernateTemplate().save(permission);
}
else
{
permission.setTypeQName(newTypeQNameEntity);
permission.setTypeQNameId(newTypeQNameId);
permission.setName(newName);
}
// done

2
source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java
View File

@@ -76,7 +76,7 @@ public class CalendarModelUriPatch extends AbstractPatch
protected String applyInternal() throws Exception
{
// modify namespace for all calendar entries
qnameDAO.updateNamespaceEntity(URI_BEFORE, URI_AFTER);
qnameDAO.updateNamespace(URI_BEFORE, URI_AFTER);
// reindex the calendar entries
int count = reindex("TYPE:\\{" + QueryParser.escape(URI_BEFORE) + "\\}*", importerBootstrap.getStoreRef());