From af65b405e96499573bf061cf279a7e795e98f7f1 Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Wed, 10 Jul 2019 17:10:00 +0200
Subject: [PATCH] update is exposed is not a required field
---
CRM/Dataprocessor/DAO/DataProcessorFilter.php | 4 ++--
CRM/Dataprocessor/Form/DataProcessor.php | 2 +-
sql/auto_install.sql | 2 +-
xml/schema/CRM/Dataprocessor/DataProcessorFilter.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CRM/Dataprocessor/DAO/DataProcessorFilter.php b/CRM/Dataprocessor/DAO/DataProcessorFilter.php
index 0ea5708b..41773640 100644
--- a/CRM/Dataprocessor/DAO/DataProcessorFilter.php
+++ b/CRM/Dataprocessor/DAO/DataProcessorFilter.php
@@ -6,7 +6,7 @@
*
* Generated from /buildkit/build/search/sites/default/files/civicrm/ext/dataprocessor/xml/schema/CRM/Dataprocessor/DataProcessorFilter.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a5f8d79f22a2e1d8467977bdfec1209e)
+ * (GenCodeChecksum:6dd12cb48d198744c5d17149671521c9)
*/
/**
@@ -194,7 +194,7 @@ class CRM_Dataprocessor_DAO_DataProcessorFilter extends CRM_Core_DAO {
'name' => 'is_exposed',
'type' => CRM_Utils_Type::T_BOOLEAN,
'title' => CRM_Dataprocessor_ExtensionUtil::ts('Is exposed'),
- 'required' => TRUE,
+ 'required' => FALSE,
'default' => '1',
'table_name' => 'civicrm_data_processor_filter',
'entity' => 'DataProcessorFilter',
diff --git a/CRM/Dataprocessor/Form/DataProcessor.php b/CRM/Dataprocessor/Form/DataProcessor.php
index 43effde3..5bc7c4f7 100644
--- a/CRM/Dataprocessor/Form/DataProcessor.php
+++ b/CRM/Dataprocessor/Form/DataProcessor.php
@@ -55,7 +55,7 @@ class CRM_Dataprocessor_Form_DataProcessor extends CRM_Core_Form {
CRM_Utils_System::redirect($session->readUserContext());
break;
case CRM_Core_Action::EXPORT:
- $file_download_name = 'configuration.json';
+ $file_download_name = $this->dataProcessor['name'].'.json';
$mime_type = 'application/json';
$buffer = json_encode(CRM_Dataprocessor_Utils_Importer::export($this->dataProcessorId), JSON_PRETTY_PRINT);
CRM_Utils_System::download(
diff --git a/sql/auto_install.sql b/sql/auto_install.sql
index 6f53f0f8..664ff4f4 100644
--- a/sql/auto_install.sql
+++ b/sql/auto_install.sql
@@ -139,7 +139,7 @@ CREATE TABLE `civicrm_data_processor_filter` (
`title` varchar(255) NOT NULL ,
`type` varchar(255) NOT NULL ,
`is_required` tinyint NULL ,
- `is_exposed` tinyint NOT NULL DEFAULT 1 ,
+ `is_exposed` tinyint NULL DEFAULT 1 ,
`configuration` text NULL ,
`filter_value` text NULL
,
diff --git a/xml/schema/CRM/Dataprocessor/DataProcessorFilter.xml b/xml/schema/CRM/Dataprocessor/DataProcessorFilter.xml
index 48f5ee87..8756dd5c 100644
--- a/xml/schema/CRM/Dataprocessor/DataProcessorFilter.xml
+++ b/xml/schema/CRM/Dataprocessor/DataProcessorFilter.xml
@@ -63,7 +63,7 @@
<name>is_exposed</name>
<title>Is exposed</title>
<type>boolean</type>
- <required>true</required>
+ <required>false</required>
<default>1</default>
</field>
<field>
--
GitLab