inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge V1.2.0 BRANCH to HEAD

Browse Source 
svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-03-22 12:23:43 +00:00
parent 3588409683
commit afbc7754e5
3 changed files with 99 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/messages/webclient.properties
View File

@@ -755,6 +755,9 @@ home_space_name=Home Space Name
title_admin_console=Administration Console
admin_console=Administration Console
admin_description=Use this view to perform system administration functions.
admin_limited_license=Licensed: {0} license issued on {1,date,short} limited to {2} days expiring {3,date,short} ({4} days remaining).
admin_unlimited_license=Licensed: {0} license issued on {1,date,short} (does not expire).
admin_invalid_license=Licensed: LICENSE INVALID - Alfresco Repository restricted to read-only capability.
# UI Page Titles
title_about=About Alfresco

2
source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
View File

@@ -397,7 +397,7 @@ public abstract class InviteUsersWizard extends AbstractWizardBean
int offset = PermissionService.GROUP_PREFIX.length();
for (String group : groups)
{
if (group.toLowerCase().indexOf(containsLower) != -1)
if (group.toLowerCase().indexOf(containsLower, offset) != -1)
{
results.add(new SortableSelectItem(group, group.substring(offset), group));
}

13
source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
View File

@@ -136,15 +136,21 @@ public class NewRuleWizard extends BaseActionWizard
private DataModel allActionsDataModel;
private DataModel allConditionsDataModel;
private boolean isFinished = false;
/**
* Deals with the finish button being pressed
*
* @return outcome
*/
public String finish()
public synchronized String finish()
{
String outcome = FINISH_OUTCOME;
if (isFinished == false)
{
isFinished = true;
UserTransaction tx = null;
try
@@ -229,6 +235,9 @@ public class NewRuleWizard extends BaseActionWizard
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e);
outcome = null;
isFinished = false;
}
}
return outcome;
@@ -678,6 +687,8 @@ public class NewRuleWizard extends BaseActionWizard
this.allConditionsProperties = new ArrayList<Map<String, Serializable>>();
this.allActionsProperties = new ArrayList<Map<String, Serializable>>();
this.isFinished = false;
}
/**