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

dev/core#2270 - Editing a smartgroup created through the search builder renders the new block by force #19257

Merged
merged 1 commit into from
Dec 23, 2020

Conversation

VangelisP
Copy link
Contributor

Overview

This is a PR of issue https://lab.civicrm.org/dev/core/-/issues/2270 where the new block (select record type / operator) is render on both cases: on a new search builder form and on existing search builder forms (when editing the smartgroup)

Before

The new record type/operator line is now appearing on either an existing smartgroup done via the searchbuilder or on a new searchbuilder form.

After

The new record type + operator line should appear only on the new searchbuilder form

Technical Details

Assuming that I am not skipping anything, there should be a check happening here .
For example, right now it's :

for example this:

    // Initialize new form
    if (!$this->_blockCount) {
      $this->_blockCount = 4;
      $this->set('newBlock', 1);
    }

should be something like this:

    // Initialize new form
    if (!$this->_blockCount) {
      $this->_blockCount = 4;
      if (!$this->_ssID) {
        $this->set('newBlock', 1);
      }
    }

@civibot
Copy link

civibot bot commented Dec 22, 2020

(Standard links)

@civibot civibot bot added the master label Dec 22, 2020
@eileenmcnaughton
Copy link
Contributor

This needs an r-run but as long as it passes that is good to merge IHMO

@demeritcowboy
Copy link
Contributor

r-run: looks good

@seamuslee001
Copy link
Contributor

merging as per the review from Eileen and Dave

@seamuslee001 seamuslee001 merged commit 68e7edd into civicrm:master Dec 23, 2020
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.

4 participants