projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f569b9
bdceaf6
)
Merge pull request #19660 from totten/master-afform-token
author
colemanw
<coleman@civicrm.org>
Mon, 22 Mar 2021 20:44:11 +0000
(16:44 -0400)
committer
GitHub
<noreply@github.com>
Mon, 22 Mar 2021 20:44:11 +0000
(16:44 -0400)
Afform - Add support for email tokens `{afform.myFormUrl}`
1
2
ext/afform/core/CRM/Afform/AfformScanner.php
patch
|
diff1
|
diff2
|
blob
|
history
ext/afform/core/Civi/Api4/Action/Afform/Get.php
patch
|
diff1
|
diff2
|
blob
|
history
ext/afform/core/Civi/Api4/Afform.php
patch
|
diff1
|
diff2
|
blob
|
history
ext/afform/core/afform.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ext/afform/core/CRM/Afform/AfformScanner.php
index e524a3f1f9146667d563aba7ded5c30c181822a1,fd04527d0f4b01e20aabb8f627541b25982a80f0..f4e4bd86340411b605156da3980ba9115997b07e
---
1
/
ext/afform/core/CRM/Afform/AfformScanner.php
---
2
/
ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/
ext/afform/core/CRM/Afform/AfformScanner.php
@@@
-134,8
-134,8
+134,9
@@@
class CRM_Afform_AfformScanner
'description' => '',
'is_dashlet' => FALSE,
'is_public' => FALSE,
+ 'is_token' => FALSE,
'permission' => 'access CiviCRM',
+ 'type' => 'system',
];
$metaFile = $this->findFilePath($name, self::METADATA_FILE);
diff --cc
ext/afform/core/Civi/Api4/Action/Afform/Get.php
Simple merge
diff --cc
ext/afform/core/Civi/Api4/Afform.php
Simple merge
diff --cc
ext/afform/core/afform.php
Simple merge