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 
14628: Second attempt at ETHREEOH-2144 fix - tested against several known good webforms.
   14854: Fix for ETHREEOH-2206. Also fixes minor issue where rule condition selection box was not reset after adding a condition to a composite.
   14862: Fix for ETHREEOH-1946 - correctly coerce nodes returned from javascript into AVMTemplateNode objects if they are AVM NodeRef objects.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-06-23 14:34:50 +00:00
parent 272a2812c1
commit e470d63e36
3 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,16 +55,18 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
// This limitation is introduced by the fact that we are have two "current"
// conditions - either normal condition, or composite conditions
// basically, the UI will have to store conditions in a more native way
// (instead of DataModel) to get unlimited number of composite conditions
// recursing
// (instead of DataModel) to get unlimited number of composite conditions recursing
protected DataModel currentCompositeConditionsDataModel;
protected List<Map<String, Serializable>> currentCompositeConditionPropertiesList;
private boolean addingCompositeCondition;
private boolean editCurrentCompositeCondition;
private int rowIndex = -1;
public CreateCompositeRuleWizard()
{
// TODO Auto-generated constructor stub
}
@Override
@@ -75,7 +77,6 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
this.setAddingCompositeCondition(false);
this.currentCompositeConditionsDataModel = null;
this.currentCompositeConditionPropertiesList = null;
}
public void setupCompositeConditionsMode()
@@ -83,7 +84,6 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
this.setAddingCompositeCondition(true);
this.currentCompositeConditionsDataModel = new ListDataModel();
this.currentCompositeConditionPropertiesList = new ArrayList<Map<String, Serializable>>();
}
private void clearCompositeConditionMode()
@@ -94,7 +94,6 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
this.currentCompositeConditionsDataModel = null;
this.currentCompositeConditionPropertiesList = null;
this.setAddingCompositeCondition(false);
}
/**
@@ -147,10 +146,7 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
IHandler handler = this.conditionHandlers.get(this.selectedCondition);
// creating object temporarily so we can pass it to
// CompositeConditionHandler
// Map<String, Serializable> newCompositeCondition = new HashMap<String,
// Serializable>();
// creating object temporarily so we can pass it to CompositeConditionHandler
currentConditionProperties.put(CompositeConditionHandler.PROP_COMPOSITE_CONDITION,
(Serializable) this.currentCompositeConditionPropertiesList);
currentConditionProperties.put(PROP_CONDITION_NAME, this.selectedCondition);
@@ -165,11 +161,22 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
}
if (logger.isDebugEnabled())
logger.debug("Generated Summary - [" + summary + "] + selectedCondition " + this.selectedCondition);
if (editingCondition == false)
if (this.editCurrentCompositeCondition == true)
{
if (rowIndex != -1)
{
this.allConditionsPropertiesList.remove(rowIndex);
this.allConditionsPropertiesList.add(rowIndex, currentConditionProperties);
}
}
else
{
this.allConditionsPropertiesList.add(currentConditionProperties);
}
this.editCurrentCompositeCondition = false;
this.rowIndex = -1;
clearCompositeConditionMode();
// refresh the wizard
goToPage(context, this.returnViewId);
@@ -194,6 +201,8 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
@Override
public void cancelAddCondition()
{
this.editCurrentCompositeCondition = false;
this.rowIndex = -1;
if (isAddingCompositeCondition())
{
// don't clear when editing, since we are looking at a REFERENCE to an existing condition
@@ -224,7 +233,6 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
super.cancelAddCondition();
return;
}
}
/**
@@ -274,7 +282,6 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
{
if (logger.isDebugEnabled())
logger.debug("\tEdited composite condition. ");
//editingCondition = false;
}
this.currentConditionProperties = new HashMap<String, Serializable>(3);
@@ -284,10 +291,12 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
this.currentConditionProperties.put(PROP_CONDITION_NAME, CompositeConditionHandler.NAME);
this.currentConditionProperties.put(BaseConditionHandler.PROP_CONDITION_NOT, Boolean.FALSE);
// reset the action drop down
this.selectedCondition = null;
// refresh the wizard
printConditionState();
goToPage(context, this.returnViewId);
}
/**
@@ -305,6 +314,8 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
if (!isAddingCompositeCondition())
{
Map condition = (Map) this.allConditionsDataModel.getRowData();
this.rowIndex = this.allConditionsDataModel.getRowIndex();
this.editCurrentCompositeCondition = true;
if (condition.get(PROP_CONDITION_NAME).equals(CompositeConditionHandler.NAME))
{
@@ -322,8 +333,6 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
super.editCondition(subCondition);
}
}
public List<SelectItem> getCompositeConditions()
{