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.

Sign up for GitHub

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

Jump to bottom

CRM-20539 Do not heed dao default for field when setting defaults on report #10319

Merged
merged 2 commits into from
May 11, 2017
Merged

CRM-20539 Do not heed dao default for field when setting defaults on report #10319

merged 2 commits into from
May 11, 2017

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented May 9, 2017 •
edited by civicrm-builder
Loading

eileenmcnaughton
eileenmcnaughton commented May 9, 2017
View reviewed changes
CRM/Report/Form.php
@@ -690,16 +690,7 @@ public function preProcess() {
}

foreach ($this->_columns as $tableName => $table) {
// set alias
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is just an extraction for readability

eileenmcnaughton
eileenmcnaughton commented May 9, 2017
View reviewed changes
CRM/Report/Form.php
@@ -714,7 +705,7 @@ public function preProcess() {
}
}

$doNotCopy = array('required');
$doNotCopy = array('required', 'default');
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is the change - ie. if the DAO defaults to 1 then that doesn't mean the field should default to displayed or being a group by

@seamuslee001
Copy link
Contributor

Jenkins test this please

jitendrapurohit
jitendrapurohit approved these changes May 11, 2017
View reviewed changes
Copy link
Contributor

@jitendrapurohit jitendrapurohit left a comment

Choose a reason for hiding this comment

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

Tested and agree that the default is not set from the DAO fields, hence not needed while copying.

@eileenmcnaughton eileenmcnaughton merged commit 53537f1 into civicrm:master May 11, 2017
@eileenmcnaughton
Copy link
Contributor Author

thanks!

@eileenmcnaughton eileenmcnaughton deleted the report branch May 11, 2017 04:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jitendrapurohit jitendrapurohit jitendrapurohit approved these changes

Assignees
No one assigned
Labels
master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eileenmcnaughton @seamuslee001 @jitendrapurohit @civicrm-builder