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 8e0e0b7ef2
commit 75c30bf373
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/bean/LoginBean.java
View File

@@ -288,7 +288,7 @@ public class LoginBean implements Serializable
NodeRef homeSpaceRef = (NodeRef) this.getNodeService().getProperty(getPersonService().getPerson(this.username), ContentModel.PROP_HOMEFOLDER);
// check that the home space node exists - else user cannot login
if (this.getNodeService().exists(homeSpaceRef) == false)
if (homeSpaceRef == null || this.getNodeService().exists(homeSpaceRef) == false)
{
throw new InvalidNodeRefException(homeSpaceRef);
}
@@ -353,8 +353,17 @@ public class LoginBean implements Serializable
}
catch (InvalidNodeRefException refErr)
{
String msg;
if (refErr.getNodeRef() != null)
{
msg = refErr.getNodeRef().toString();
}
else
{
msg = Application.getMessage(fc, MSG_NONE);
}
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(fc,
Repository.ERROR_NOHOME), refErr.getNodeRef().getId()));
Repository.ERROR_NOHOME), msg));
}
}
else
@@ -425,6 +434,7 @@ public class LoginBean implements Serializable
private static final String MSG_ERROR_UNKNOWN_USER = "error_login_user";
private static final String MSG_ERROR_LOGIN_DISALLOWED = "error_login_disallowed";
private static final String MSG_ERROR_LOGIN_MAXUSERS = "error_login_maxusers";
private static final String MSG_NONE = "none";
public static final String MSG_USERNAME_LENGTH = "login_err_username_length";
public static final String MSG_PASSWORD_LENGTH = "login_err_password_length";

2
source/java/org/alfresco/web/bean/users/EditUserWizard.java
View File

@@ -94,7 +94,7 @@ public class EditUserWizard extends CreateUserWizard
// calculate home space name and parent space Id from homeFolderId
this.homeSpaceLocation = null; // default to Company root space
NodeRef homeFolderRef = (NodeRef) props.get("homeFolder");
if (this.getNodeService().exists(homeFolderRef) == true)
if (homeFolderRef != null && this.getNodeService().exists(homeFolderRef) == true)
{
ChildAssociationRef childAssocRef = this.getNodeService().getPrimaryParent(homeFolderRef);
NodeRef parentRef = childAssocRef.getParentRef();

10
source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java
View File

@@ -375,8 +375,7 @@ public class UIDeploymentServers extends UIInput
out.write("<table cellpadding='0' cellspacing='0'>");
out.write("<tr><td width='100%'><table cellpadding='3' cellspacing='0' class='deployConfigServerDetailsLeftCol'>");
if (WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(getAddType()) ||
(WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(server.getDeployType())))
if (WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(server.getDeployType()))
{
out.write("<tr><td align='right'>");
@@ -677,10 +676,8 @@ public class UIDeploymentServers extends UIInput
Utils.encodeRecursive(context, group);
out.write("</td></tr>");
// MER START
if (WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(getAddType() ) ||
(server != null && WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(server.getDeployType())))
if (!edit && WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(getAddType() ) ||
(edit && WCMAppModel.CONSTRAINT_FILEDEPLOY.equals(server.getDeployType())))
{
// for an FSR create the protocol adapter field
out.write("<tr><td align='right'>");
@@ -724,7 +721,6 @@ public class UIDeploymentServers extends UIInput
out.write("</td></tr>");
}
// MER END
// create the server host field
out.write("<tr><td align='right'>");