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

Smarty variables] Remove isset from batch form #22187

Merged
merged 1 commit into from
Dec 10, 2021
Merged

Smarty variables] Remove isset from batch form #22187

merged 1 commit into from
Dec 10, 2021

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Affects url civicrm/financial/financialbatches?reset=1&batchStatus=1

Before

fatal with hardened smarty

After

ok

Technical Details

Comments

@civibot
Copy link

civibot bot commented Nov 30, 2021

(Standard links)

@civibot civibot bot added the master label Nov 30, 2021
@eileenmcnaughton
Copy link
Contributor Author

Stacktrace
api\v4\Action\DateTest::testRelativeDateRanges
Failed asserting that an array contains 9.

/home/jenkins/bknix-dfl/build/core-22187-36q9f/web/sites/all/modules/civicrm/tests/phpunit/api/v4/Action/DateTest.php:96
/home/jenkins/bknix-dfl/extern/phpunit8/phpunit8.phar:671

@eileenmcnaughton
Copy link
Contributor Author

test this please

@eileenmcnaughton eileenmcnaughton changed the title Remove isset from batch form Smarty variables] Remove isset from batch form Dec 1, 2021
@eileenmcnaughton
Copy link
Contributor Author

test this please

@eileenmcnaughton
Copy link
Contributor Author

@colemanw this is failing only on a known test fail - should be an easy one

@demeritcowboy
Copy link
Contributor

jenkins retest this please

demeritcowboy
demeritcowboy reviewed Dec 6, 2021
View reviewed changes
templates/CRM/Financial/Form/Search.tpl Outdated
@@ -9,7 +9,7 @@
*}

{* Financial search component. *}
{if !isset($batchStatus)}
{if $batchStatus}
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be !$batchStatus

@eileenmcnaughton
Remove isset from batch form
5218709 
Affects url civicrm/financial/financialbatches?reset=1&batchStatus=1
@eileenmcnaughton
Copy link
Contributor Author

@demeritcowboy I've updated this - on review I've changed the approach slightly

@demeritcowboy demeritcowboy merged commit aa04b78 into civicrm:master Dec 10, 2021
@eileenmcnaughton eileenmcnaughton deleted the smarty13 branch December 10, 2021 05:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@demeritcowboy demeritcowboy demeritcowboy left review comments

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

Successfully merging this pull request may close these issues.
2 participants
@eileenmcnaughton @demeritcowboy