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

Do not show Activity Separation on when viewing an Activity #15046

Merged
merged 1 commit into from Aug 17, 2019

Conversation

19ATF72
Copy link
Contributor

@19ATF72 19ATF72 commented Aug 15, 2019

Overview

Activity separation fields show up when viewing an activity.

Before

before

After

after

Steps to replicate

1.Find and open a profile of the contact from the precondition
2.Click "Actions" → "Meeting"
3.Click "Save"
4.Open the created meeting (Click "View")
5.Take a look at the "Activity Separation" field

@civicrm-builder
Copy link

Can one of the admins verify this patch?

@civibot
Copy link

civibot bot commented Aug 15, 2019

(Standard links)

@civibot civibot bot added the master label Aug 15, 2019
@seamuslee001
Copy link
Contributor

add to whitelist

@eileenmcnaughton
Copy link
Contributor

I agree with this - @demeritcowboy ?

@demeritcowboy
Copy link
Contributor

@eileenmcnaughton I saw this one but didn't personally see it as a "problem". It is visually awkward and serves no purpose though if it's not going to show you what the original choice was. I can take a look.

@eileenmcnaughton
Copy link
Contributor

thanks @demeritcowboy it does look odd & I guess that option is mostly about creating the activity rather than a 'feature' of it

@demeritcowboy
Copy link
Contributor

Just see the note below for tech.

  • General standards
    • [r-explain] PASS
    • [r-user] PASS
    • [r-doc] PASS
    • [r-run] PASS
  • Developer standards

@demeritcowboy
Copy link
Contributor

And that is now the 6th time I've seen that (unrelated) test failure - see https://lab.civicrm.org/dev/core/issues/938.

@19ATF72
Copy link
Contributor Author

19ATF72 commented Aug 16, 2019

@demeritcowboy Updated changes to reflect your suggestion.
Can you please check it?
Thanks

@demeritcowboy
Copy link
Contributor

Looks good. Thanks @19ATF77.

A separate note: In looking at that line it was bugging me "why isn't it just ==ADD"? It seems that originally it was but was changed consciously but without too much explanation: See ef89f22

Based on the jira issue maybe it has something to do with when you do a contact search and then select multiple and choose Add Activity? That is still working but then has an unrelated notice which is also present before the patch:
Notice: Undefined index: allowRepeatConfigToSubmit in CRM_Core_Form_RecurringEntity::postProcess() (line 346 of /.../web/sites/all/modules/civicrm/CRM/Core/Form/RecurringEntity.php)

Anyway, something for another day.

@yashodha
Copy link
Contributor

@19ATF77
I second @demeritcowboy comment - looks like option should be there for ADD action.

@demeritcowboy
Copy link
Contributor

demeritcowboy commented Aug 16, 2019

@yashoda Just checking since the word add is confusing here - you mean that it's currently a negative comparison so that the search results dropdown choice for add activity works, not that you're saying the line should be changed back to only compare against ADD. Right?

@eileenmcnaughton
Copy link
Contributor

@yashodha @demeritcowboy looks like this is agreed & mergeable?

@demeritcowboy
Copy link
Contributor

From my point of view yes. It r-runs properly as is in all situations I tested. Any other questions could be dealt with separately.

@eileenmcnaughton eileenmcnaughton merged commit 88cd7aa into civicrm:master Aug 17, 2019
@eileenmcnaughton
Copy link
Contributor

ok thanks @yashodha @demeritcowboy @19ATF77

@eileenmcnaughton
Copy link
Contributor

Is there a gitlab to close?

@19ATF72
Copy link
Contributor Author

19ATF72 commented Aug 19, 2019

No gitlab, and thanks for the time.

@19ATF72 19ATF72 deleted the Fix_Activitytpl branch August 19, 2019 15:52
@demeritcowboy
Copy link
Contributor

To update on the earlier discussion about whether the line should be just ==ADD, the action is actually CRM_Core_Action::BASIC in the situation where you are creating from the contact search results page, so that explains that. I've added ticket https://lab.civicrm.org/dev/core/issues/1192 for the E_NOTICE.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
6 participants