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

Fix Household Regression #7222

Merged
merged 16 commits into from
Dec 12, 2023
Merged

Fix Household Regression #7222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6b2c0eb
Fix check for isHHAccount
npsp-reedestockton Dec 7, 2023
6ed53c8
Remove unnecessary field checks
npsp-reedestockton Dec 7, 2023
98919c9
Fix namespace issue in canUpdateHousehold()
npsp-reedestockton Dec 8, 2023
9317c73
Refactor namespace fix
npsp-reedestockton Dec 8, 2023
b204fc9
Testing 2gp failure. Will be reverted...
npsp-reedestockton Dec 9, 2023
57a408e
Revert "Testing 2gp failure. Will be reverted..."
npsp-reedestockton Dec 9, 2023
a7beb6a
Testing 2gp failure. Will be reverted...
npsp-reedestockton Dec 9, 2023
f267088
Testing 2gp failure. Will be reverted...
npsp-reedestockton Dec 9, 2023
ba8bf84
Testing re-introducing HH_ManageHH_CTRL original changes (with !isHHA…
npsp-reedestockton Dec 9, 2023
49ee61b
Revert "Testing re-introducing HH_ManageHH_CTRL original changes (wit…
npsp-reedestockton Dec 9, 2023
e113cdc
Original HH_ManageHH_CTRL and HH_ManageHH visualforce page
npsp-reedestockton Dec 9, 2023
d6b118d
Add back AuraEnabled and isMergeable changes
npsp-reedestockton Dec 9, 2023
c6e3656
Add back structure of saveHouseholdPage and return true from checkAdd…
npsp-reedestockton Dec 9, 2023
8ab333c
Re-introduce check of visible address fields.
npsp-reedestockton Dec 10, 2023
1f0ad88
Re-introduce original HH_ManageHH_CTRL code with reversed !isHHAccount.
npsp-reedestockton Dec 10, 2023
61c5989
Remove isHHAccount reference and check for permission exceptions
npsp-reedestockton Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions force-app/main/default/classes/HH_Container_LCTRL.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,21 +551,12 @@ public with sharing class HH_Container_LCTRL {
}

Set<String> addressFields = new Set<String>{
'Default_Address__c',
'Household_Account__c',
'Address_Type__c',
'MailingStreet__c',
'MailingStreet2__c',
'MailingCity__c',
'MailingState__c',
'MailingPostalCode__c',
'MailingCountry__c',
'Seasonal_Start_Month__c',
'Seasonal_Start_Day__c',
'Seasonal_End_Month__c',
'Seasonal_End_Day__c',
'Geolocation__Latitude__s',
'Geolocation__Longitude__s'
'MailingCountry__c'
};

for (String addressField : addressFields) {
Expand Down
7 changes: 4 additions & 3 deletions force-app/main/default/classes/HH_ManageHH_CTRL.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,12 @@ public with sharing class HH_ManageHH_CTRL {
String accountToCheck = isHHAccount ? 'Account' : 'npo02__Household__c';
Set<String> fieldsToCheck = new Set<String>();
for (FieldSetMember fsMember : hhFieldSet) {
DescribeFieldResult dfr = fsMember.getSObjectField().getDescribe();
if (dfr.isCalculated() || !dfr.permissionable || fsMember.getFieldPath().contains('__r')) {
continue;
}
fieldsToCheck.add(fsMember.getFieldPath());
}
if (isHHAccount) {
fieldsToCheck.add('npo02__Household__c');
}
for (String fieldToCheck : fieldsToCheck) {
if (!UTIL_Permissions.canUpdate(accountToCheck, fieldToCheck, false)) {
return false;
Expand Down
Loading