Afternoon merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java

@@ -212,6 +212,16 @@ public class CreateRuleWizard extends BaseActionWizard
    // ------------------------------------------------------------------------------
    // Bean Getters and Setters
    
+   /**
+    * Determines whether the rule type drop down list should be enabled.
+    * 
+    * @return false as the rule type drop down should be enabled
+    */
+   public boolean getRuleTypeDisabled()
+   {
+      return false;
+   }
+   
    /**
     * Returns the properties for all the conditions as a JSF DataModel
     * 

source/java/org/alfresco/web/bean/rules/EditRuleWizard.java

@@ -136,6 +136,19 @@ public class EditRuleWizard extends CreateRuleWizard
       return outcome;
    }
    
+   // ------------------------------------------------------------------------------
+   // Bean Getters and Setters
+   
+   /**
+    * Determines whether the rule type drop down list should be enabled.
+    * 
+    * @return true as the rule type drop down should be disabled
+    */
+   public boolean getRuleTypeDisabled()
+   {
+      return true;
+   }
+   
    // ------------------------------------------------------------------------------
    // Helper methods