extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Infolog - fix bugs with contact & project ID fighting

Browse Source
This commit is contained in:
nathangray 2017-09-15 11:24:06 -06:00
parent 9563049f41
commit 5e36e2f033
4 changed files with 85 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
infolog/inc/class.infolog_bo.inc.php
View File

@ -460,6 +460,11 @@ class infolog_bo
{
$info['old_pm_id'] = $info['pm_id'] = $id;
}
else
{
// Link might be contact, check others
$this->get_pm_id($info);
}
$info['info_link'] = $info['info_contact'] = array(
'app' => $app,
'id' => $id,
@ -469,13 +474,28 @@ class infolog_bo
//echo " title='$title'</p>\n";
return $info['blur_title'] = $title;
}
$info['info_link'] = $info['info_contact'] = array('id' => 'none', 'title' => $info['info_from']);
// Set ID to 'none' instead of unset to make it seem like there's a value
$info['info_link'] = $info['info_contact'] = $info['info_from'] ? array('id' => 'none', 'title' => $info['info_from']) : null;
$info['info_link_id'] = 0; // link might have been deleted
$info['info_custom_from'] = (int)!!$info['info_from'];
return False;
}
/**
* Find projectmanager ID from linked project(s)
*
* @param Array $info
*/
public function get_pm_id(&$info)
{
$pm_links = Link::get_links('infolog',$info['info_id'],'projectmanager');
$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $info['old_pm_id'];
if (!isset($info['pm_id']) && $old_pm_id) $info['pm_id'] = $old_pm_id;
}
/**
* Create a subject from a description: truncate it and add ' ...'
*/
@ -1051,7 +1071,12 @@ class infolog_bo
protected function write_check_links(&$values)
{
$old_link_id = (int)$values['info_link_id'];
if($values['info_contact'])
if($values['info_contact'] && !(
is_array($values['info_contact']) && $values['info_contact']['id'] == 'none'
) || (
is_array($values['info_contact']) && $values['info_contact']['id'] == 'none' &&
array_key_exists('search', $values['info_contact'])
))
{
if(is_array($values['info_contact']))
{
@ -1106,6 +1131,19 @@ class infolog_bo
else
{
unset($values['info_link_id']);
$values['info_from'] = null;
}
if($values['info_id'] && $values['old_pm_id'] !== $values['pm_id'])
{
// Project has changed, but link is not to project
if($values['pm_id'])
{
$link_id = Link::link('infolog', $values['info_id'], 'projectmanager', $values['pm_id']);
if(!$values['info_link_id'])
{
$values['info_link_id'] = $link_id;
}
}
}
if ($old_link_id && $old_link_id != $values['info_link_id'])
{

38
infolog/test/SetProjectManagerTest.php
View File

@ -190,12 +190,48 @@ class SetProjectManagerTest extends \EGroupware\Api\AppTest
$this->checkElements();
}
/**
* Test free text in the contact field
*/
public function testFreeContact()
{
$info = $this->getTestInfolog();
// Set up the test - just set info_contact
$info['info_contact'] = array(
'app' => null,
'id' => null,
'search' => 'Free text'
);
// Set project by pm_id
$info['pm_id'] = $this->pm_id;
$this->info_id = $this->bo->write($info);
$this->assertArrayHasKey('info_id', $info, 'Could not make test infolog');
$this->assertThat($this->info_id,
$this->logicalAnd(
$this->isType('integer'),
$this->greaterThan(0)
)
);
// Check infolog has pm_id properly set
$this->assertEquals($this->pm_id, $info['pm_id']);
// Force links to run notification now so we get valid testing - it
// usually waits until Egw::on_shutdown();
Api\Link::run_notifies();
// Check project
$this->checkElements();
}
public function testLoadWithProject()
{
// Saving the infolog should try to send a notification
$this->bo->tracking->expects($this->once())
->method('track')
->with($this->callback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
->will($this->returnCallback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
$info = $this->getTestInfolog();