diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index b062d949cd..05c2729c57 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -91,15 +91,13 @@ recent_spaces=Recent Spaces
shortcuts=Shortcuts
company_home=Company Home
my_home=My Home
-advanced_search=Advanced Search
new_search=New Search
search_results=Search Results
search_detail=Search for \"{0}\" results shown below
close_search=Close Search
browse_spaces=Browse Spaces
browse_content=Content items
-items=item(s)
-location=Item Location
+location=Location
toggle_shelf=Hide or Show the Shelf
shelf=Shelf
actions=Actions
@@ -107,7 +105,6 @@ view=View
view_details=View Details
view_details_file=View Details for file
change_details=Change Details
-view_details=View Details
update=Update
cut=Cut
copy=Copy
@@ -145,7 +142,6 @@ network_folder=Open Network Folder
other_action=Run Action
information=Information
move=Move
-copy=Copy
type=Type
aspect=Aspect
workflow=Workflow
@@ -154,7 +150,6 @@ system_error=System Error
login=Login
templates=Templates
template=Template
-local=Local
select_button=Select...
select_items=Select items
select_an_item=Select an item
@@ -225,10 +220,8 @@ manage_invited_users=Manage Space Users
manage_content_users=Manage Content Users
modify_user_roles=Modify User Roles for
modify=Modify
-view=View
logout=Logout
add=Add
-system_info=System Information
node_browser=Node Browser
reset_config=Reset Config Service
save=Save
@@ -348,8 +341,6 @@ back_button=Back
finish_button=Finish
cancel_button=Cancel
clear_button=Clear
-title=Title
-description=Description
you_may_want=You may want to
# Category Management messages
@@ -365,7 +356,6 @@ new_category=New Category
category_props=Category Properties
items=Items
title_delete_category=Delete Category
-delete_category=Delete Category
delete_category_warning=This category has {0} existing document(s) linked to it.
delete_category_info=To remove this category and all it's sub-categories, click Delete.
delete_category_confirm=Are you sure you want to delete category \"{0}\" and all sub-categories?
@@ -456,7 +446,6 @@ which_copy_current=Use copy in current space
which_copy_other=Use copy uploaded from my computer
locate_doc_upload=Locate document to upload
file_location=Location
-click_upload=Click upload
minor_change=Minor Change
major_change=Major Change
notes=Notes
@@ -518,7 +507,7 @@ apply_dashboard_info=Select a template to be applied to the Space as a Dashboard
export_info=Exports metadata and content from this or all Spaces.
export_from=Export From
package_name=Package Name
-all_spaces=Repository Root
+all_spaces_root=Repository Root
current_space=Current Space
include_children=Include Children
include_self=Include this Space
@@ -546,8 +535,6 @@ locate_content_upload=Locate and upload your document to the repository.
# Edit Workflow messages
modify_workflow_props=Modify Properties of Simple Workflow
-approve_flow=Approve Flow
-reject_flow=Reject Flow
name_approve_step=Name for approve step
name_reject_step=Name for reject step
select_reject_step=Do you want to provide a reject step?
@@ -581,7 +568,7 @@ content_type=Content Type
content_format=Content Format
inline_editable=Inline Editable
locate_document=Locate document to upload
-location=Location
+content_location=Location
click_upload=Click upload
file_upload_success=The file ''{0}'' was uploaded successfully. If the file you uploaded does not exist, then an empty file will be created with the name you specified.
content_finish_instruction=To add the content to this space click Finish. To review or change your selections click Back.
@@ -617,14 +604,12 @@ new_rule_finish_instruction_edit=To update the rule click Finish. To review or c
select_action=Select Action
select_an_action=Select an action...
action=Action
-actions=Actions
action_settings=Action Settings
set_action_values=Set action values
select_feature=Select required feature
version_notes=Version Notes
checkout_location=Check out location
destination=Destination
-subject=Subject
message=Message
category=Category
categories=Categories
@@ -652,7 +637,7 @@ apply_to_sub_spaces=Apply rule to sub spaces
run_in_background=Run rule in background
not=Not
click_set_and_add=Click to set values and add to list
-click_add=Click to add to list
+click_add_to_list=Click to add to list
set_and_add_button=Set Values and Add
selected_conditions=Selected Rule Conditions
selected_actions=Selected Rule Actions
@@ -713,7 +698,6 @@ how_to_create_space=How do you want to create your space?
from_scratch=From scratch
based_on_existing_space=Based on an existing space
using_a_template=Using a template
-choose_space_icon=Choose space icon
existing_space=Existing Space
copy_existing_space=Copy existing space
structure=Structure
@@ -889,6 +873,7 @@ error_rule=Failed to create Rule due to error: {0}
error_space=Failed to create new space due to error: {0}
error_person=Failed to create Person due to error: {0}
error_delete_user=Failed to delete User due to error: {0}
+error_delete_user_object=Unable to delete the User object associated with the Person. This is not an error if an external authentication mechanism such as NTLM was previously active.
error_remove_user=Failed to remove User due to error: {0}
error_password_match=Please ensure that both password fields contain the same value.
error_property=Property ''{0}'' is not available for this node
diff --git a/source/java/org/alfresco/web/bean/users/UsersBean.java b/source/java/org/alfresco/web/bean/users/UsersBean.java
index 35716f1fdb..0451497623 100644
--- a/source/java/org/alfresco/web/bean/users/UsersBean.java
+++ b/source/java/org/alfresco/web/bean/users/UsersBean.java
@@ -27,6 +27,7 @@ import javax.faces.event.ActionEvent;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -54,6 +55,7 @@ public class UsersBean implements IContextListener
public static final String ERROR_PASSWORD_MATCH = "error_password_match";
private static final String ERROR_DELETE = "error_delete_user";
+ private static final String ERROR_USER_DELETE = "error_delete_user_object";
private static final String DEFAULT_OUTCOME = "manageUsers";
@@ -78,6 +80,7 @@ public class UsersBean implements IContextListener
private String confirm = null;
private String searchCriteria = null;
+
// ------------------------------------------------------------------------------
// Construction
@@ -264,7 +267,14 @@ public class UsersBean implements IContextListener
if (session.get(LoginBean.LOGIN_EXTERNAL_AUTH) == null)
{
// delete the User authentication
- authenticationService.deleteAuthentication((String) getPerson().getProperties().get("userName"));
+ try
+ {
+ authenticationService.deleteAuthentication((String) getPerson().getProperties().get("userName"));
+ }
+ catch (AuthenticationException authErr)
+ {
+ Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), ERROR_USER_DELETE));
+ }
}
// delete the associated Person
diff --git a/source/web/jsp/dialog/export.jsp b/source/web/jsp/dialog/export.jsp
index f59fa523b6..752f8ca648 100644
--- a/source/web/jsp/dialog/export.jsp
+++ b/source/web/jsp/dialog/export.jsp
@@ -145,7 +145,7 @@
diff --git a/source/web/jsp/wizard/new-rule/condition.jsp b/source/web/jsp/wizard/new-rule/condition.jsp
index 7623435dda..5685d29984 100644
--- a/source/web/jsp/wizard/new-rule/condition.jsp
+++ b/source/web/jsp/wizard/new-rule/condition.jsp
@@ -259,7 +259,7 @@
// also check to see if the 'no-condition' option has been selected, if it has, change
// the explanation text and the button label
- var short_text = "";
+ var short_text = "";
var long_text = "";
var short_label = "";
var long_label = "";