Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

C51-384: Added case tokens on Email Activity Modal #13473

Merged
merged 1 commit into from
Jan 20, 2019
Merged

C51-384: Added case tokens on Email Activity Modal #13473

merged 1 commit into from
Jan 20, 2019

Conversation

deb1990
Copy link
Contributor

@deb1990 deb1990 commented Jan 16, 2019

Overview

As part of this PR, "Case" tokens has been added to the Email Activity Modal.

Before

before

After

after

Technical Details

In CRM/Contact/Form/Task/Email.php, added a block of code to add the Case Tokens when caseId is present.
The added code is similar to

if (isset($this->_caseId) || isset($this->_caseIds)) {

@civibot
Copy link

civibot bot commented Jan 16, 2019

(Standard links)

@civibot civibot bot added the master label Jan 16, 2019
@deb1990 deb1990 changed the title (WIP) C51-384: Added case tokens on Email Activity Modal C51-384: Added case tokens on Email Activity Modal Jan 16, 2019
@swastikpareek
Copy link
Contributor

Looks good.

@shitijg
Copy link

shitijg commented Jan 16, 2019

passed internal Compucorp testing.
Gitlab ref: https://lab.civicrm.org/dev/core/issues/668
@colemanw

@seamuslee001
Copy link
Contributor

Jenkins re test this please

@colemanw
Copy link
Member

  • General standards
    • (r-explain) Pass
    • (r-user) Pass: More consistent behavior between email and pdf screens.
    • (r-doc) Pass - I think this is self-explanatory and doesn't need user docs.
    • (r-run) Pass: Tested by @shitijg
  • Developer standards
    • (r-tech) Pass: Code matches existing code in the PDF system.
    • (r-code) Pass
    • (r-maint) Pass
    • (r-test) Pass - I think we can do without one here.

@colemanw
Copy link
Member

Test fails unrelated.

@colemanw colemanw merged commit 4e2d3ad into civicrm:master Jan 20, 2019
@deb1990 deb1990 deleted the C51-384-add-case-token-in-email branch January 21, 2019 06:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants