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

N°7963 - Inlineimage::SetDefaultOrgId blend field name between Person and linked class #680

Open
wants to merge 8 commits into
base: support/3.2
Choose a base branch
from
Open

N°7963 - Inlineimage::SetDefaultOrgId blend field name between Person and linked class #680

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2d0c31
N°7963 - Inlineimage::SetDefaultOrgId blend field name between Person…
accognet Nov 13, 2024
83f1476
Refactor
accognet Nov 25, 2024
309b6bd
Replace UserRightsProfile::GetOwnerOrganizationAttCode($sClass) by U…
accognet Dec 9, 2024
f26ed0e
indentation
accognet Dec 16, 2024
77989b6
Add tests
accognet Dec 16, 2024
2415d3d
Add tests
accognet Dec 16, 2024
add7743
Add tests
accognet Dec 16, 2024
3ff97be
use new method GetOwnerOrganizationAttCode in Attachment
accognet Dec 16, 2024
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
10 changes: 5 additions & 5 deletions core/inlineimage.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,18 +153,18 @@ public function SetDefaultOrgId()
//
if (MetaModel::IsValidClass('Person'))
{
$aCallSpec = array($sClass, 'MapContextParam');
if (is_callable($aCallSpec))
$aCallSpecPerson = array('Person', 'MapContextParam');
if (is_callable($aCallSpecPerson))
{
$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
if (MetaModel::IsValidAttCode($sClass, $sAttCode))
$sAttCodePerson = call_user_func($aCallSpecPerson, 'org_id'); // Returns null when there is no mapping for this parameter
if (MetaModel::IsValidAttCode('Person', $sAttCodePerson))
{
// OK - try it
//
$oCurrentPerson = MetaModel::GetObject('Person', UserRights::GetContactId(), false);
if ($oCurrentPerson)
{
$this->Set('item_org_id', $oCurrentPerson->Get($sAttCode));
$this->Set('item_org_id', $oCurrentPerson->Get($sAttCodePerson));
}
}
}
Expand Down