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

PersonView deactivation bug resolution #2400

Merged
merged 2 commits into from May 17, 2023
Merged

PersonView deactivation bug resolution #2400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c5442
PersonView deactivation bug resolution
phili67 May 17, 2023
8471032
src/EcclesiaCRM/VIEWControllers/People/VIEWPeopleController.php : update
phili67 May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/EcclesiaCRM/VIEWControllers/People/VIEWPeopleController.php
View file
Open in desktop
Expand Up @@ -56,6 +56,9 @@
use EcclesiaCRM\FamilyCustomQuery;
use EcclesiaCRM\FamilyCustomMasterQuery;

use EcclesiaCRM\Utils\GeoUtils;
use EcclesiaCRM\Utils\InputUtils;

use Slim\Views\PhpRenderer;

class VIEWPeopleController {
Expand Down Expand Up @@ -602,15 +605,6 @@ public function argumentsPeoplePersonViewArray ($iPersonID, $mode = 'none')

$sPageTitleSpan .= '</span>';

if (!empty($person->getDateDeactivated())) {
?>
<div class="alert alert-warning">
<strong><?= _("This Person is Deactivated") ?> </strong>
</div>
<?php
}


$persons = PersonQuery::Create()->filterByDateDeactivated(null)->findByFamId($iFamilyID);

$singlePerson = false;
Expand Down Expand Up @@ -668,8 +662,9 @@ public function argumentsPeoplePersonViewArray ($iPersonID, $mode = 'none')
'iFamilyID' => $iFamilyID,
'sFamilyEmails' => $sFamilyEmails
],
'PersonInfos' => [
'PersonInfos' => [
'iPersonID' => $iPersonID,
'singlePerson' => $singlePerson,
'person' => $person,
'sPhoneCountry' => $sPhoneCountry,
'sHomePhone' => $sHomePhone,
Expand Down Expand Up @@ -979,5 +974,5 @@ public function argumentsPeopleUpdateAllLatLonArray () {
'sPageTitle' => $sPageTitle
];

}
}
}
8 changes: 8 additions & 0 deletions src/v2/templates/people/personview.php
View file
Open in desktop
Expand Up @@ -23,6 +23,14 @@
require $sRootDocument . '/Include/Header.php';
?>

<?php if (!empty($PersonInfos['person']->getDateDeactivated())) {
?>
<div class="alert alert-warning">
<strong><?= _("This Person is Deactivated") ?> </strong>
</div>
<?php
} ?>

<div class="container-fluid">
<div class="row">
<div class="col-md-3">
Expand Down