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

Browse Source 
13023: ISO date fix for ETHREEOH-1215
   13153: Merged V2.1-A to V3.1
      9026: - Added "My Content" link to error page
            - Manual merge of Safari fixes
            - Fixed exploded build target after recent removals
   13155: Restored line removed in merge
   13156: Merged V2.1-A to V3.1
      9027: *RECORD-ONLY* Further Safari rendering fix
      9028: Removed use of generics from JSP so it compiles in JBoss
   13161: Merged V2.1-A to V3.1
      9051: *RECORD-ONLY* Fix for ACT 2806 (linked content was returning 404 error)
   13162: Merged V2.1-A to V3.1
      8680: *RECORD-ONLY* Added back "too_many_users" message as it got removed
   13164: Merged V2.1-A to V3.1
      8699: Added DOCTYPE line
      8994: Added Copyright for Sun due to Rhino debugger use.
      9388: *RECORD-ONLY* ACT-3263 - Localization of "username" and "password" in login.jsp
   13166: Merged V2.1-A to V3.1
      9748: *RECORD-ONLY* Fix for ACT 3455 (ADB-90) - Editor role can not check out documents
      10199: Fix for ADB-86: Clicking 'Cancel' while adding a composite condition for a Rule on a space in CS ES has no effect
   13167: Merged V2.1-A to V3.1
      10673: Fix for ADB-110/ACT-4247: Review/Change Records Management URLs and make it compatible to Adobe's build
      10674: Fix for ADB-109: setting log4j.rootLogger to WARN thows unexpected warn when accessing My Home
   13168: Merged V2.1-A to V3.1
      10883: *RECORD-ONLY* Fix for ADB-124: Change Search field length to 1
      10905: Fix for ADB-114 ACT 4425. Also will fix ALFCOM-1895 when merged to HEAD.
      10961: Fix for ADB-44: Create menu link should not be visible if the menu is empty
      10962: Fix for ADB-61: Alfresco breadcrumbs + Navigator become inconsistent....

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 14:25:06 +00:00
parent de9feffb28
commit a07c125fd3
11 changed files with 97 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
View File

@@ -196,14 +196,28 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
{
if (isAddingCompositeCondition())
{
//don't clear when editing, since we are looking at a REFERENCE to an existing condition
if (this.editingCondition == false) {
// don't clear when editing, since we are looking at a REFERENCE to an existing condition
if (this.editingCondition == false)
{
this.currentConditionProperties.clear();
}
// reset the action drop down
this.selectedCondition = null;
this.selectedCondition = null;
// determine what page to go back to
FacesContext context = FacesContext.getCurrentInstance();
String currentViewId = context.getViewRoot().getViewId();
IHandler handler = this.conditionHandlers.get(CompositeConditionHandler.NAME);
goToPage(FacesContext.getCurrentInstance(), handler.getJSPPath());
String compositePage = handler.getJSPPath();
if (currentViewId.equals(compositePage))
{
this.returnViewId = getWizardContainerViewId(context);
}
goToPage(FacesContext.getCurrentInstance(), this.returnViewId);
}
else
{