From fdbf336a78a20a1ee464a01e6168a04732f0479e Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Mon, 14 Jan 2019 16:59:45 +0100
Subject: [PATCH] update
---
ang/form_processor/actions/ConditionDialogCtrl.html | 8 ++++----
ang/form_processor/actions/crmFormProcessorActions.js | 2 --
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ang/form_processor/actions/ConditionDialogCtrl.html b/ang/form_processor/actions/ConditionDialogCtrl.html
index ffbe1cb..f955880 100644
--- a/ang/form_processor/actions/ConditionDialogCtrl.html
+++ b/ang/form_processor/actions/ConditionDialogCtrl.html
@@ -6,16 +6,16 @@
name="type"
ui-jq="select2"
ui-options="{dropdownAutoWidth : true, allowClear: true}"
- ng-model="action.condition_configuration"
- ng-options="conditionType.title for conditionType in conditionTypes">
+ ng-model="action.condition_configuration.name"
+ ng-options="conditionTypeName as conditionType.title for (conditionTypeName, conditionType) in conditionTypes">
<option value="">{{ts('- No condition -')}}</option>
</select>
<crm-ap-condition-configuration
- action="action"
+ action="action.type"
name="action.condition_configuration.name"
context="{{model.context}}"
- configuration="action.condition_configuration.configuration"
+ configuration="action.condition_configuration"
fields="model.fields"
mapping="action.condition_configuration.mapping">
</crm-ap-condition-configuration>
diff --git a/ang/form_processor/actions/crmFormProcessorActions.js b/ang/form_processor/actions/crmFormProcessorActions.js
index 660b7b1..3756f82 100644
--- a/ang/form_processor/actions/crmFormProcessorActions.js
+++ b/ang/form_processor/actions/crmFormProcessorActions.js
@@ -131,7 +131,6 @@
if (index < 0) {
action.configuration = angular.copy(actionObject.default_configuration);
}
- console.log(action);
formProcessorFactory.getFieldList($scope.inputs, $scope.actions, actionObject, $scope.context).
then(function (fields) {
var model = {
@@ -149,7 +148,6 @@
$scope.actions[index] = data.action;
}
else if ($scope.new_id == data.action.id) {
- console.log(data.action);
$scope.actions.push(data.action);
$scope.new_id--;
}
--
GitLab