#2799361 - Create rules_and and rules_or condition sets (expressions)…

… in the UI.
fago · Oct 4, 2016 · ef2f28c · ef2f28c
1 parent d58ca75
commit ef2f28c
Show file tree

Hide file tree

Showing 4 changed files with 323 additions and 95 deletions.
diff --git a/src/Form/EditExpressionForm.php b/src/Form/EditExpressionForm.php
@@ -67,7 +67,7 @@ public function buildForm(array $form, FormStateInterface $form_state, RulesUiHa
       throw new NotFoundHttpException();
     }
     $form_handler = $expression->getFormHandler();
-    $form = $form_handler->form($form, $form_state);
+    $form = $form_handler->form($form, $form_state, ['init' => TRUE]);
     return $form;
   }
 

diff --git a/src/Form/Expression/ActionContainerForm.php b/src/Form/Expression/ActionContainerForm.php
@@ -34,11 +34,11 @@ public function __construct(ActionExpressionContainerInterface $action_set) {
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
-    $form['action_table'] = [
+    $form['action_table_container'] = [
       '#type' => 'container',
     ];
 
-    $form['action_table']['table'] = [
+    $form['action_table_container']['action_table'] = [
       '#type' => 'table',
       '#header' => [
         $this->t('Elements'),
@@ -75,7 +75,7 @@ public function form(array $form, FormStateInterface $form_state) {
     foreach ($actions as $action) {
       /* @var $action \Drupal\rules\Engine\ExpressionInterface */
       $uuid = $action->getUuid();
-      $row = &$form['action_table']['table'][$uuid];
+      $row = &$form['action_table_container']['action_table'][$uuid];
 
       // TableDrag: Mark the table row as draggable.
       $row['#attributes']['class'][] = 'draggable';
@@ -133,7 +133,7 @@ public function form(array $form, FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $values = $form_state->getValue('table');
+    $values = $form_state->getValue('action_table');
     $component = $this->getRulesUiHandler()->getComponent();
     /* @var $rule_expression \Drupal\rules\Plugin\RulesExpression\Rule */
     $rule_expression = $component->getExpression();