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

CRM-19435: IncludeSmartGroups Option added #9156

Merged
merged 2 commits into from
Oct 13, 2016

Conversation

jainabhishek14
Copy link

@jainabhishek14 jainabhishek14 commented Oct 1, 2016

Added a new parameter "includeSmartGroups" for getContactGroups to include smart groups in the result.


@civicrm-builder
Copy link

Can one of the admins verify this patch?

@jainabhishek14
Copy link
Author

I am really sorry, if this would be dumbest question? Can i know the status of this patch?

@seamuslee001
Copy link
Contributor

Well its in the list for review. Someone will eventually review it.

@monishdeb monishdeb changed the title IncludeSmartGroups Option added CRM-19435: IncludeSmartGroups Option added Oct 5, 2016
@monishdeb
Copy link
Member

@tschuettler @jainabhishek14 I think this PR provide a better solution over #9149 as per your discussion. Reason why I have added the ticket number in title. So should I close #9149 ?

@tschuettler
Copy link
Contributor

Yes, that's fine with me.

@monishdeb
Copy link
Member

Ok closed #9149

@monishdeb
Copy link
Member

Jenkins ok to test

@jainabhishek14
Copy link
Author

build error was:
[xUnit] [ERROR] - No test reports found for the metric 'JUnit' with the resolved pattern 'junit/*.xml'. Configuration error?.

is it test case undefined issue?

@monishdeb
Copy link
Member

monishdeb commented Oct 6, 2016

@jainabhishek14 sorry didn't have any idea about that BUT as per the test build you got 11 style errors which need to be fixed, these are :

  • GroupContact.php:344, TabsUsed, Priority: High
    Spaces must be used to indent lines; tabs are not allowed
  • GroupContact.php:362, ControlSignature, Priority: High
    Expected "if (...) {\n"; found "if(...){\n"
  • GroupContact.php:362, IncorrectExact, Priority: High
    Line indented incorrectly; expected 4 spaces, found 1
  • GroupContact.php:362, TabsUsed, Priority: High
    Spaces must be used to indent lines; tabs are not allowed
  • GroupContact.php:363, TabsUsed, Priority: High
    Spaces must be used to indent lines; tabs are not allowed
  • GroupContact.php:363, IncorrectExact, Priority: High
    Line indented incorrectly; expected 6 spaces, found 2
  • GroupContact.php:364, IncorrectExact, Priority: High
    Line indented incorrectly; expected 2 spaces, found 1
  • GroupContact.php:364, TabsUsed, Priority: High
    Spaces must be used to indent lines; tabs are not allowed
  • GroupContact.php:365, EndLine, Priority: High
    Whitespace found at end of line
  • GroupContact.php:366, IncorrectExact, Priority: High
    Line indented incorrectly; expected 2 spaces, found 4
  • GroupContact.php:367, IncorrectExact, Priority: High
    Line indented incorrectly; expected 4 spaces, found 6

For detail https://test.civicrm.org/job/CiviCRM-Core-PR/12001/checkstyleResult/new/

@jainabhishek14
Copy link
Author

@monishdeb I have fixed the style errors. Should I create a new pull request or modify this one?

@seamuslee001
Copy link
Contributor

@jainabhishek14 just push to the same branch as this PR

@jainabhishek14
Copy link
Author

@seamuslee001 I already pushed the fix but it does not reflect here..

@seamuslee001
Copy link
Contributor

@jainabhishek14 was it on the same branch the CRM-19435 branch?

@jainabhishek14
Copy link
Author

@seamuslee001 yes

@seamuslee001
Copy link
Contributor

I see the commit here now not sure why it wasn't there before and its past the style checker and onto the test suite.

@jainabhishek14
Copy link
Author

@seamuslee001 Thanks, I can see it now...
also could you also help me what does "[xUnit] [ERROR] - No test reports found for the metric 'JUnit' with the resolved pattern 'junit/*.xml'. Configuration error?." mean?

@seamuslee001
Copy link
Contributor

@jainabhishek14 That was from your first test run the 2nd one is here https://test.civicrm.org/job/CiviCRM-Core-PR/12050 (there is currently an orange circle next to your 2nd commit which indicates test is running)

@jainabhishek14
Copy link
Author

Thank you very much @seamuslee001 for the information.

@monishdeb monishdeb self-assigned this Oct 12, 2016
@monishdeb
Copy link
Member

monishdeb commented Oct 12, 2016

Before

image

After

image

@@ -340,7 +340,8 @@ public static function getContactGroup(
$ignorePermission = FALSE,
$onlyPublicGroups = FALSE,
$excludeHidden = TRUE,
$groupId = NULL
$groupId = NULL,
$includeSmartGroups = FALSE
Copy link
Member

@monishdeb monishdeb Oct 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jainabhishek14 you need to also document the new parameter $includeSmartGroups in the function description as

 @param bool $includeSmartGroups 
                     [short description]

Everything else is working fine :)

@monishdeb
Copy link
Member

monishdeb commented Oct 13, 2016

Anyways I am merging this PR and will submit a separate PR for the mentioned change.

Submitted #9233

@monishdeb monishdeb merged commit d5e6ab3 into civicrm:master Oct 13, 2016
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