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 V2.1 to HEAD

Browse Source 
6309: Fixed AWC-1195 - Email space users.
   6311: AWC-1378
   6319: Fixed minor caching bug
   6320, 6326: Some fixes to the raw content download servlet available on /dr
   6324: Fix for AWC-1444 (workflow history issue)
   6325: Exceptions that occur in NavigatorPluginBean now correctly logged to the console


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 12:58:48 +00:00
parent bf4349d64d
commit f9bad97b04
9 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/bean/ajax/NavigatorPluginBean.java
View File

@@ -52,6 +52,7 @@ import org.alfresco.web.bean.NavigationBean;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.data.IDataContainer;
import org.alfresco.web.data.QuickSort;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.repo.component.UITree.TreeNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -346,6 +347,7 @@ public class NavigatorPluginBean implements IContextListener
}
catch (Throwable err)
{
Utils.addErrorMessage("NavigatorPluginBean exception in getCompanyHomeRootNodes()", err);
try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
}
}
@@ -397,6 +399,7 @@ public class NavigatorPluginBean implements IContextListener
}
catch (Throwable err)
{
Utils.addErrorMessage("NavigatorPluginBean exception in getMyHomeRootNodes()", err);
try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
}
}
@@ -451,6 +454,7 @@ public class NavigatorPluginBean implements IContextListener
}
catch (Throwable err)
{
Utils.addErrorMessage("NavigatorPluginBean exception in getGuestHomeRootNodes()", err);
try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
}
}

2
source/java/org/alfresco/web/bean/repository/User.java
View File

@@ -200,7 +200,7 @@ public final class User
NamespaceService namespaceService = registry.getNamespaceService();
ConfigurableService configurableService = Repository.getConfigurableService(fc);
NodeRef person = Application.getCurrentUser(fc).getPerson();
NodeRef person = getPerson();
if (nodeService.hasAspect(person, ApplicationModel.ASPECT_CONFIGURABLE) == false)
{
// create the configuration folder for this Person node