Remove search to look for user object in Reset User Password repo web script. No longer works when Solr enabled. Change instead to wrapping the people.setPassword() call in a try.. catch.

git-svn-id: https://share-extras.googlecode.com/svn/trunk/Reset Password Dialog@1244 a3f5c567-fd0f-3a89-9b71-a290c5a5f590

Author: wabson

config/alfresco/templates/webscripts/org/sharextras/slingshot/reset-user-password.post.json.js

@@ -146,29 +146,25 @@ function main()
       }
    }
 
-   var uresults = search.query({
-      language: "lucene",
-      store: "user://alfrescoUserStore",
-      query: "PATH:\"/\\{http\\://www.alfresco.org/model/system/1.0\\}system/\\{http\\://www.alfresco.org/model/system/1.0\\}people/\\{http\\://www.alfresco.org/model/user/1.0\\}user\" +@\\{http\\://www.alfresco.org/model/user/1.0\\}username:" + user.properties.userName
-   });
-   
-   // Check that the user is local (i.e. not an LDAP user)
-   if (uresults.length != 1)
+   // Reset the password
+   try
+   {
+      u = resetPassword(userToObject(user));
+   }
+   catch (e)
    {
       status.setCode(status.STATUS_BAD_REQUEST, msg.get("error.notLocal"));
       status.redirect = true;
       return;
    }
 
-   // Reset the password
-   u = resetPassword(userToObject(user));
-   
    // Send e-mail confirmation
    try
    {
       mailResetPasswordNotification(u);
    }
-   catch (e) {
+   catch (e)
+   {
       status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg.get("error.mail"));
       status.redirect = true;
       return;

config/alfresco/templates/webscripts/org/sharextras/slingshot/reset-user-password.post.properties

@@ -15,5 +15,5 @@ error.notFound=No user found with e-mail address {0}
 error.multiple=Multiple users found. Please contact an administrator to reset your password.
 error.disabled=Could not reset the password as the user is disabled
 error.disallowed=Password resets are disallowed for this user
-error.notLocal=Could not reset the password as the user is not a local user. Please contact an administrator to reset your password.
+error.notLocal=Could not reset the password - is this a directory user? Please contact an administrator to reset your password.
 error.mail=Could not reset the password as an e-mail confirmation could not be sent