civicrm-core.git
4 years agoMerge pull request #18470 from JKingsnorth/dev/core#2027-2
Eileen McNaughton [Wed, 16 Sep 2020 19:19:03 +0000 (07:19 +1200)]
Merge pull request #18470 from JKingsnorth/dev/core#2027-2

dev/core#2027 Add/update to UK county list

4 years agoMerge pull request #18423 from eileenmcnaughton/afform
colemanw [Wed, 16 Sep 2020 14:44:23 +0000 (10:44 -0400)]
Merge pull request #18423 from eileenmcnaughton/afform

dev/core#2000 Move afform into core extensions

4 years agodev/core#2027 Add/update to UK county list
John Kingsnorth [Wed, 16 Sep 2020 11:11:06 +0000 (12:11 +0100)]
dev/core#2027 Add/update to UK county list

4 years agoMerge pull request #18486 from eileenmcnaughton/part
Monish Deb [Wed, 16 Sep 2020 07:29:11 +0000 (12:59 +0530)]
Merge pull request #18486 from eileenmcnaughton/part

dev/event#42 [Ref] Separate url path calculation into the relevant classes

4 years agoMerge pull request #18480 from eileenmcnaughton/dom_org
Seamus Lee [Wed, 16 Sep 2020 05:57:44 +0000 (15:57 +1000)]
Merge pull request #18480 from eileenmcnaughton/dom_org

dev/core#2039 Set is_primary to 1 on email, address for domain contacts

4 years agoMerge pull request #18487 from civicrm/5.30
Seamus Lee [Wed, 16 Sep 2020 05:51:04 +0000 (15:51 +1000)]
Merge pull request #18487 from civicrm/5.30

5.30

4 years ago[Ref] Separate url path calculation into the relevant classes
eileen [Wed, 16 Sep 2020 03:53:39 +0000 (15:53 +1200)]
[Ref] Separate url path calculation into the relevant classes

4 years agoMerge pull request #18482 from seamuslee001/5.30
Eileen McNaughton [Wed, 16 Sep 2020 04:17:47 +0000 (16:17 +1200)]
Merge pull request #18482 from seamuslee001/5.30

release-notes/5.29.1.md

4 years agoMerge pull request #18478 from seamuslee001/api_v4_fin_acl_test
Eileen McNaughton [Wed, 16 Sep 2020 04:17:04 +0000 (16:17 +1200)]
Merge pull request #18478 from seamuslee001/api_v4_fin_acl_test

[NFC] Enable APIv4 testing on the Fin ACL Extension Line Item test

4 years agoMerge pull request #18464 from eileenmcnaughton/urlparamms
Monish Deb [Wed, 16 Sep 2020 03:41:41 +0000 (09:11 +0530)]
Merge pull request #18464 from eileenmcnaughton/urlparamms

[REF] Start the process of separating the search action from the participant form

4 years agoMerge pull request #18463 from eileenmcnaughton/searchhhook
Monish Deb [Wed, 16 Sep 2020 03:11:10 +0000 (08:41 +0530)]
Merge pull request #18463 from eileenmcnaughton/searchhhook

dev/core#2017 remove unused SearchTaskHookSample.php

4 years agoRegenerate sql
eileen [Wed, 16 Sep 2020 02:03:04 +0000 (14:03 +1200)]
Regenerate sql

4 years agodev/core#2039 Set is_primary to 1 on email, address for domain contacts
eileen [Wed, 16 Sep 2020 00:52:52 +0000 (12:52 +1200)]
dev/core#2039 Set is_primary to 1 on email, address for domain contacts

I'm digging into the places where the code handles is_primary due to duplicate handling/ queries
- see https://lab.civicrm.org/dev/core/-/issues/2039

One distraction is that the domain contact's address & email are not marked is_primary. This
doesn't make sense to me as they ARE a contact in the DB

4 years agoPhpcs fix
eileen [Thu, 10 Sep 2020 20:34:50 +0000 (08:34 +1200)]
Phpcs fix

4 years agoRemove commented out line
eileen [Thu, 10 Sep 2020 03:47:37 +0000 (15:47 +1200)]
Remove commented out line

4 years agoRemove more commented out code that is upsetting CI
eileen [Thu, 10 Sep 2020 03:41:36 +0000 (15:41 +1200)]
Remove more commented out code that is upsetting CI

4 years agoRemove more commented out function
eileen [Thu, 10 Sep 2020 03:09:37 +0000 (15:09 +1200)]
Remove more commented out function

4 years agoStyle fixes
eileen [Thu, 10 Sep 2020 01:18:00 +0000 (13:18 +1200)]
Style fixes

I removed the commented out functions rather than figuring out how to style them right

4 years agoMisc style fix
eileen [Wed, 9 Sep 2020 21:31:53 +0000 (09:31 +1200)]
Misc style fix

4 years agoRe-run civix upgrader
eileen [Wed, 9 Sep 2020 21:31:41 +0000 (09:31 +1200)]
Re-run civix upgrader

4 years agoRe-run civix
eileen [Wed, 9 Sep 2020 21:17:02 +0000 (09:17 +1200)]
Re-run civix

4 years agoUpdate API factory functions with checkPermissions
Coleman Watts [Fri, 17 Jul 2020 14:07:09 +0000 (10:07 -0400)]
Update API factory functions with checkPermissions

4 years agoUse standard api for getFields
Coleman Watts [Wed, 12 Feb 2020 16:21:16 +0000 (11:21 -0500)]
Use standard api for getFields

4 years agoUpdate API docblock.
Coleman Watts [Sat, 1 Feb 2020 16:44:44 +0000 (11:44 -0500)]
Update API docblock.

4 years agoUse built-in php function to do what we were trying to do with str_replace
Coleman Watts [Fri, 31 Jan 2020 16:40:26 +0000 (11:40 -0500)]
Use built-in php function to do what we were trying to do with str_replace

4 years agoCode comment
Coleman Watts [Fri, 31 Jan 2020 16:39:40 +0000 (11:39 -0500)]
Code comment

4 years agoRevert "Reinstate parsing of data from the form"
Coleman Watts [Fri, 17 Jan 2020 00:49:47 +0000 (19:49 -0500)]
Revert "Reinstate parsing of data from the form"

This reverts commit d31206f9e08703ae4f11b7e34673d7ece92b1630.

4 years agoSupport is_primary fields and boolean options.
Coleman Watts [Thu, 16 Jan 2020 15:53:24 +0000 (10:53 -0500)]
Support is_primary fields and boolean options.

Civi 5.23 changes boolean options to be real true and false instead of '1' and '0'
so added version bump to keep in step.

4 years agoMore efficient select options handling
Coleman Watts [Fri, 10 Jan 2020 17:59:49 +0000 (12:59 -0500)]
More efficient select options handling

The afField.getOptions function was causing infinite recursion by recreating the boolean options array every time.
Passing this variable by refernce solves the problem, and adding "track by" to the ng-repeat follows best-practices for efficiency.

4 years agoReinstate parsing of data from the form
eileen [Fri, 10 Jan 2020 01:09:34 +0000 (14:09 +1300)]
Reinstate parsing of data from the form

This means that data can be set in an embedded form e.g

 <af-entity data='{name_a : options.name_a,  name_b : options.name_b, is_name_b_nickname: options.is_name_b_nickname, is_name_b_inferior: options.is_name_b_inferior}' .... />

In this case the options.name_as comes from the directive that instantiates this afform

4 years agoIncrement suggested version to reflect info.xml
eileen [Fri, 10 Jan 2020 01:05:28 +0000 (14:05 +1300)]
Increment suggested version to reflect info.xml

Arguably afform still works on older versions but breaking changes have happened & if people
use it on older you want a buyer-beware type feeling

4 years agoRelease v0.4
Coleman Watts [Thu, 9 Jan 2020 20:11:15 +0000 (15:11 -0500)]
Release v0.4

4 years agoLoosen restrictions on file names - allow underscores
Coleman Watts [Wed, 8 Jan 2020 13:23:03 +0000 (08:23 -0500)]
Loosen restrictions on file names - allow underscores

4 years agoUse api to get directive/module names
Coleman Watts [Wed, 8 Jan 2020 13:20:54 +0000 (08:20 -0500)]
Use api to get directive/module names

4 years agoRename custom blocks and optimize api get by file/module/directive name
Coleman Watts [Tue, 7 Jan 2020 22:35:33 +0000 (17:35 -0500)]
Rename custom blocks and optimize api get by file/module/directive name

4 years agoApi - output module_name & directive_name
Coleman Watts [Mon, 6 Jan 2020 22:45:01 +0000 (17:45 -0500)]
Api - output module_name & directive_name

4 years agoLoad join blocks primary first
Coleman Watts [Sun, 5 Jan 2020 19:47:35 +0000 (14:47 -0500)]
Load join blocks primary first

4 years agoGUI - improve menu button appearance
Coleman Watts [Sun, 5 Jan 2020 03:30:17 +0000 (22:30 -0500)]
GUI - improve menu button appearance

4 years agoGUI - simplify menus; only add items from palette
Coleman Watts [Sun, 5 Jan 2020 03:29:20 +0000 (22:29 -0500)]
GUI - simplify menus; only add items from palette

4 years agoImprove drag-n-drop placeholder & validation
Coleman Watts [Sun, 5 Jan 2020 02:10:11 +0000 (21:10 -0500)]
Improve drag-n-drop placeholder & validation

4 years agoFix loading fields for contact type blocks
Coleman Watts [Sat, 4 Jan 2020 20:13:00 +0000 (15:13 -0500)]
Fix loading fields for contact type blocks

4 years agoRename blocks & require form name
Coleman Watts [Sat, 4 Jan 2020 01:42:59 +0000 (20:42 -0500)]
Rename blocks & require form name

4 years agoGUI - Add block fields to field palette
Coleman Watts [Fri, 3 Jan 2020 20:40:39 +0000 (15:40 -0500)]
GUI - Add block fields to field palette

4 years agoGUI - Implement Save Block feature
Coleman Watts [Fri, 3 Jan 2020 03:01:19 +0000 (22:01 -0500)]
GUI - Implement Save Block feature

4 years agoImplement Address block with chainSelect state/county
Coleman Watts [Tue, 31 Dec 2019 17:45:00 +0000 (12:45 -0500)]
Implement Address block with chainSelect state/county

4 years agoGUI - present Individual/Organization/Household as seperate entities
Coleman Watts [Mon, 30 Dec 2019 04:29:18 +0000 (23:29 -0500)]
GUI - present Individual/Organization/Household as seperate entities

Also adds per-contact-type default name blocks.

4 years agoRefactor af-block directive into af-repeat and af-join
Coleman Watts [Fri, 27 Dec 2019 19:55:49 +0000 (14:55 -0500)]
Refactor af-block directive into af-repeat and af-join

This allows mix-n-match between blocks and repeatable things, allowing
entity fieldsets to be repeated, as well as arbitrary non-repeatable blocks.

4 years agoImplement afform blocks for multi-value custom groups
Coleman Watts [Fri, 20 Dec 2019 20:47:02 +0000 (15:47 -0500)]
Implement afform blocks for multi-value custom groups

4 years agoImplement afform blocks for Email, Phone, IM, Website
Coleman Watts [Tue, 10 Dec 2019 20:03:42 +0000 (15:03 -0500)]
Implement afform blocks for Email, Phone, IM, Website

Blocks are reusable, repeatable afforms that extend other entities

4 years agoUpdate git clone url
eileen [Thu, 2 Jan 2020 18:57:18 +0000 (18:57 +0000)]
Update git clone url

Note other updates around installation still needed

4 years agoFix #10 add prefix to new afforms to prevent name conflicts
Coleman Watts [Sat, 28 Dec 2019 01:23:30 +0000 (20:23 -0500)]
Fix #10 add prefix to new afforms to prevent name conflicts

4 years agoRemove unnecessary registerField process
Coleman Watts [Sun, 22 Dec 2019 01:10:49 +0000 (20:10 -0500)]
Remove unnecessary registerField process

4 years agoGUI - set default permission for new forms
Coleman Watts [Sat, 21 Dec 2019 00:51:51 +0000 (19:51 -0500)]
GUI - set default permission for new forms

4 years agoUpdate docs to reflect less metadata in default afform scope
Coleman Watts [Fri, 20 Dec 2019 12:18:45 +0000 (07:18 -0500)]
Update docs to reflect less metadata in default afform scope

4 years agoAfformScanner - Just use the long cache
Tim Otten [Fri, 20 Dec 2019 07:53:13 +0000 (23:53 -0800)]
AfformScanner - Just use the long cache

The long cache didn't exist when this class was first created, but it seems
better suited. #knockonwood

4 years agoAfformScanner - Simplify cache. Fix CLI/web sync bug.
Tim Otten [Fri, 20 Dec 2019 07:41:10 +0000 (23:41 -0800)]
AfformScanner - Simplify cache. Fix CLI/web sync bug.

Example bug:

1. Find a packaged (non-overriden) form - e.g. `mockPage`
2. Run `cv api4 Afform.update +w name=mockPage +v permissions='*always allow*'
3. Run `curl http://localhost/civicrm/mock-page`
4. Observe: the page-load fails even though the permissions say it should work

The call to `Afform.update` should trigger a cache-clear, but it only fixes
on the CLI...  because the CLI and web have different runtime IDs.

The runtime-id was included preventively in anticipation that oddball
multisite arrangements might need to store these things separately.  But I
think it's overdone, because the runtime-ID factors in things like
`SCRIPT_FILENAME` which has no bearing on the whether to use the same cache.

Let's KISS and *if* there's any kind of multisite issue, then we can revisit.

4 years agoToward #6 - use API instead of scanner to retrieve afforms
Coleman Watts [Fri, 20 Dec 2019 02:24:08 +0000 (21:24 -0500)]
Toward #6 - use API instead of scanner to retrieve afforms

4 years agoGUI - dropdown select for permissions field
Coleman Watts [Thu, 19 Dec 2019 13:28:58 +0000 (08:28 -0500)]
GUI - dropdown select for permissions field

4 years ago(NFC) Expand docblock for afform_civicrm_permission_check()
Tim Otten [Thu, 19 Dec 2019 06:47:10 +0000 (22:47 -0800)]
(NFC) Expand docblock for afform_civicrm_permission_check()

4 years agoafform_{html,gui} - Allow editing the `permission` via web UI
Tim Otten [Thu, 19 Dec 2019 04:23:41 +0000 (20:23 -0800)]
afform_{html,gui} - Allow editing the `permission` via web UI

4 years agoafform_{html,gui} - Require "administer CiviCRM" to open editor
Tim Otten [Thu, 19 Dec 2019 04:23:14 +0000 (20:23 -0800)]
afform_{html,gui} - Require "administer CiviCRM" to open editor

4 years ago(REF) AfformSaveTrait - Extract helper $isChanged
Tim Otten [Thu, 19 Dec 2019 04:12:54 +0000 (20:12 -0800)]
(REF) AfformSaveTrait - Extract helper $isChanged

I was originally expecting to need to flush the menu whenever the
`permission` changed.  That's not necessary now (because the true permission
check is deferred until it's needed), but the cleanup may still be helpful
in the future (e.g.  if we enable nav-menu integration or change the way
permissions are implemented).

4 years agoAfform.{prefill,submit} - APIs should respect `permission`
Tim Otten [Thu, 19 Dec 2019 05:43:05 +0000 (21:43 -0800)]
Afform.{prefill,submit} - APIs should respect `permission`

4 years agoAfformUsageTest - Add a basic test case of prefill/submit APIs
Tim Otten [Thu, 19 Dec 2019 05:42:24 +0000 (21:42 -0800)]
AfformUsageTest - Add a basic test case of prefill/submit APIs

4 years agoEnforce customizable `permission` for server routes. Add E2E test for server-routes.
Tim Otten [Thu, 19 Dec 2019 04:11:52 +0000 (20:11 -0800)]
Enforce customizable `permission` for server routes. Add E2E test for server-routes.

4 years agoAfform.get - Fix warning/test-failure when trying to load non-existent record
Tim Otten [Thu, 19 Dec 2019 04:56:49 +0000 (20:56 -0800)]
Afform.get - Fix warning/test-failure when trying to load non-existent record

4 years agoafform_mock - The extra dep should be a real module
Tim Otten [Thu, 19 Dec 2019 03:03:53 +0000 (19:03 -0800)]
afform_mock - The extra dep should be a real module

Using a real Angular module means that the page can be opened in an E2E test.

4 years agoStore 'permission' property for each form
Tim Otten [Thu, 19 Dec 2019 01:59:46 +0000 (17:59 -0800)]
Store 'permission' property for each form

4 years agoinfo.xml - Bump minimum version. Needs revised hook_civicrm_angularModules.
Tim Otten [Thu, 12 Dec 2019 23:58:29 +0000 (15:58 -0800)]
info.xml - Bump minimum version. Needs revised hook_civicrm_angularModules.

4 years agoGenerate partials via callback
Tim Otten [Thu, 12 Dec 2019 23:48:42 +0000 (15:48 -0800)]
Generate partials via callback

Technically, it's two changes:

1. Changing `snippets` to `partialsCallback` to reduce the amount of upfront IO/memory.
2. Changing the mocked-up filename to start with `~/theAngModule/`. So modules implemented in
   afform look more look other modules. Makes it work with `cv ang:html:list` and `cv ang:html:show`.

4 years agoRename modelListCtrl => afform
Coleman Watts [Thu, 12 Dec 2019 13:14:03 +0000 (08:14 -0500)]
Rename modelListCtrl => afform

4 years agoFix afform partial name
Coleman Watts [Wed, 11 Dec 2019 03:22:03 +0000 (22:22 -0500)]
Fix afform partial name

ng-include was failing with ~afform* but works with ~/afform*

4 years agoUse dynamic snippet for afform module layout.
Coleman Watts [Wed, 11 Dec 2019 03:01:16 +0000 (22:01 -0500)]
Use dynamic snippet for afform module layout.

4 years agoRemove redundant afformStandalone file
Coleman Watts [Wed, 11 Dec 2019 14:44:23 +0000 (09:44 -0500)]
Remove redundant afformStandalone file

4 years agoMerge afField module into af module
Coleman Watts [Wed, 11 Dec 2019 14:38:50 +0000 (09:38 -0500)]
Merge afField module into af module

4 years agoGUI - Add option to hide field labels
Coleman Watts [Wed, 11 Dec 2019 14:05:21 +0000 (09:05 -0500)]
GUI - Add option to hide field labels

4 years agoafform_gui - Tweak nav label
Tim Otten [Tue, 10 Dec 2019 21:07:35 +0000 (13:07 -0800)]
afform_gui - Tweak nav label

4 years agoFix ngRepeat syntax error
Coleman Watts [Tue, 10 Dec 2019 20:10:49 +0000 (15:10 -0500)]
Fix ngRepeat syntax error

4 years agoafform_gui, afform_html - Refresh after reverting
Tim Otten [Tue, 10 Dec 2019 06:21:04 +0000 (22:21 -0800)]
afform_gui, afform_html - Refresh after reverting

4 years agoafform_gui, afform_html - Adjust "Revert" button based on actual status
Tim Otten [Tue, 10 Dec 2019 06:12:01 +0000 (22:12 -0800)]
afform_gui, afform_html - Adjust "Revert" button based on actual status

4 years agoAfform.get - Return computed fields, `has_local` and `has_packaged`
Tim Otten [Tue, 10 Dec 2019 06:05:10 +0000 (22:05 -0800)]
Afform.get - Return computed fields, `has_local` and `has_packaged`

4 years agoafform_gui - Add nav item under "Administer => Customize Data and Screens"
Tim Otten [Tue, 10 Dec 2019 05:01:32 +0000 (21:01 -0800)]
afform_gui - Add nav item under "Administer => Customize Data and Screens"

4 years agoafform_gui - Add skeletal upgrader
Tim Otten [Tue, 10 Dec 2019 04:58:33 +0000 (20:58 -0800)]
afform_gui - Add skeletal upgrader

4 years agoStricter directives with better docs
Coleman Watts [Mon, 9 Dec 2019 15:49:02 +0000 (10:49 -0500)]
Stricter directives with better docs

4 years agoGUI - Rename af-block => af-container
Coleman Watts [Mon, 9 Dec 2019 13:13:30 +0000 (08:13 -0500)]
GUI - Rename af-block => af-container

Free up the term af-block to refer to something more specific than a container.

4 years agoPrettier json
Coleman Watts [Sat, 7 Dec 2019 20:29:17 +0000 (15:29 -0500)]
Prettier json

4 years agoFix handling of non-breaking spaces
Coleman Watts [Tue, 3 Dec 2019 18:04:13 +0000 (13:04 -0500)]
Fix handling of non-breaking spaces

See https://stackoverflow.com/questions/59215211/why-does-domdocument-mess-up-unicode-nonbreaking-spaces

4 years agoIn shallow mode, only convert markup to array that the GUI editor understands.
Coleman Watts [Sat, 30 Nov 2019 15:52:33 +0000 (10:52 -0500)]
In shallow mode, only convert markup to array that the GUI editor understands.

Any markup not using a tag/class/attribute understood by the GUI editor
will have its contents preserved "as-is" in a "#markup" string.

4 years agoAdd api/v4/formatExamples/stylized.php
Tim Otten [Thu, 28 Nov 2019 02:08:44 +0000 (18:08 -0800)]
Add api/v4/formatExamples/stylized.php

4 years agoFormat whitespace in aff.html files
Coleman Watts [Wed, 27 Nov 2019 14:42:22 +0000 (09:42 -0500)]
Format whitespace in aff.html files

Adds api options for use in GUI editor to autoformat html whitespace.
Results in much nicer looking markup!

4 years agoAfformTest - Add coverage for weirdly named file.
Tim Otten [Thu, 28 Nov 2019 01:45:19 +0000 (17:45 -0800)]
AfformTest - Add coverage for weirdly named file.

Also: Clarify that the API input is a formName and not strictly a
directiveName.

4 years agoApi improvements and test fix
Coleman Watts [Tue, 26 Nov 2019 18:33:53 +0000 (13:33 -0500)]
Api improvements and test fix

Improve efficiency by not fetching layout if not needed in api.get
Fix test failure by correctly merging existing metadata during update

4 years agoRemove client_route for now; might be yagni
Coleman Watts [Tue, 26 Nov 2019 17:27:46 +0000 (12:27 -0500)]
Remove client_route for now; might be yagni

4 years agoUse canonical name in api.afform.get
Coleman Watts [Tue, 26 Nov 2019 14:39:23 +0000 (09:39 -0500)]
Use canonical name in api.afform.get

Names were being munged in the api which led to a mismatch between
filenames and afform names.

4 years agoGUI: Correctly handle naming a newly created form
Coleman Watts [Tue, 26 Nov 2019 14:13:49 +0000 (09:13 -0500)]
GUI: Correctly handle naming a newly created form

4 years agoGUI: Add new block to the top
Coleman Watts [Mon, 25 Nov 2019 14:56:25 +0000 (09:56 -0500)]
GUI: Add new block to the top

Creates new items at top of block, underneath the fieldset legend if present

4 years agoGUI: Add wysiwyg markup block
Coleman Watts [Mon, 25 Nov 2019 00:52:40 +0000 (19:52 -0500)]
GUI: Add wysiwyg markup block

4 years agoDisplay improvements
Coleman Watts [Fri, 22 Nov 2019 17:49:17 +0000 (12:49 -0500)]
Display improvements

4 years agoGUI: Improve adding/removing entities in correct order
Coleman Watts [Thu, 21 Nov 2019 22:11:37 +0000 (17:11 -0500)]
GUI: Improve adding/removing entities in correct order

4 years agoGUI: use strict
Coleman Watts [Tue, 19 Nov 2019 21:22:02 +0000 (16:22 -0500)]
GUI: use strict