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.2E to HEAD

Browse Source 
17635: Complete fix for ETHREEOH-2879 - user with missing first/last name able to use Discussions, Blogs, Links etc. in Share.
   17637: Fix regression from r17601: Favourite sites in header menu.
   17638: Fix ETHREEOH-3610 - upgrade Enterprise 2.x -> 3.2 (personUsagePatch)
   17641: ETHREEOH-3612 Security Issue : DeploymentTarget uses String to represent passwords
   17642: Fix for ETHREEOH-3482 - Impossible to delete content from its details page.
          - regression due to the "AbortProcessingException" changes added a while back.
   17660: Minor functional fixes for mobile app and cleanup
   17663: Fixed ETHREEOH-3664 "'My Tasks' dashlet could not load task list if a user was invited to a private site"
            - When webscript accessed a private site undefined was returned so the title and description couldn't be displayed, now the values are store on the invite task instead.
   17665: Fix up compile errors from r17663 - also clean up old code to coding standards in related invite classes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18162 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-20 10:51:08 +00:00
parent c1d54ada76
commit 9c23ced4aa
10 changed files with 252 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
View File

@@ -4062,14 +4062,8 @@ public class HibernateNodeDaoServiceImpl
final StoreRef storeRef,
final ObjectArrayQueryCallback resultsCallback)
{
final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT);
final Pair<Long, QName> personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON);
// Shortcut the query if the QNames don't exist
if (sizeCurrentPropQNamePair == null || personTypeQNamePair == null)
{
return;
}
final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT);
final Pair<Long, QName> personTypeQNamePair = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON);
HibernateCallback callback = new HibernateCallback()
{
@@ -4115,15 +4109,9 @@ public class HibernateNodeDaoServiceImpl
final StoreRef storeRef,
final ObjectArrayQueryCallback resultsCallback)
{
final Pair<Long, QName> usernamePropQNamePair = qnameDAO.getQName(ContentModel.PROP_USERNAME);
final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT);
final Pair<Long, QName> personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON);
// Shortcut the query if the QNames don't exist
if (usernamePropQNamePair == null || sizeCurrentPropQNamePair == null || personTypeQNamePair == null)
{
return;
}
final Pair<Long, QName> usernamePropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_USERNAME);
final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT);
final Pair<Long, QName> personTypeQNamePair = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON);
HibernateCallback callback = new HibernateCallback()
{