holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Infolog - fix bug causing project link to stick around after changing project.

Browse Source
This commit is contained in:
nathangray 2017-09-26 10:30:15 -06:00
parent edf6e16996
commit c74955e124
2 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1137,6 +1137,7 @@ class infolog_bo
}
if($values['info_id'] && $values['old_pm_id'] !== $values['pm_id'])
{
Link::unlink(0,'infolog',$values['info_id'],0,'projectmanager',$values['old_pm_id']);
// Project has changed, but link is not to project
if($values['pm_id'])
{
@ -1149,7 +1150,6 @@ class infolog_bo
else
{
// Project removed, but primary link is not to project
Link::unlink(0,'infolog',$values['info_id'],0,'projectmanager',$values['old_pm_id']);
$values['pm_id'] = null;
}
}

82
infolog/test/SetProjectManagerTest.php
View File

@ -316,6 +316,84 @@ class SetProjectManagerTest extends \EGroupware\Api\AppTest
$this->checkElements();
}
public function testChangeProject()
{
// Saving the infolog should try to send a notification
$this->bo->tracking->expects($this->exactly(2))
->method('track')
->will($this->returnCallback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
$info = $this->getTestInfolog();
// Set up the test - set info_contact
$info['info_contact'] = array(
'app' => 'addressbook',
// Linking to current user's contact
'id' => $GLOBALS['egw_info']['user']['person_id'],
);
// Set up the test - set pm_id
$info['pm_id'] = $this->pm_id;
$this->info_id = $this->bo->write($info);
$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();
// Now load it again
$info = $this->bo->read($this->info_id);
// Check infolog still has pm_id
$this->assertEquals($this->pm_id, $info['pm_id'], 'Project went missing');
// Now create a new project
$first_pm_id = $this->pm_id;
$this->pm_bo->data = array();
$this->makeProject('2');
$info['old_pm_id'] = $first_pm_id;
$info['pm_id'] = $this->pm_id;
$this->bo->write($info);
// 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();
// Now load it again
$info = $this->bo->read($this->info_id);
try {
// Check infolog has pm_id properly set
$this->assertEquals($this->pm_id, $info['pm_id'], 'Project did not change');
// Check project
$this->checkElements();
// Check links (should be only 1)
$pm_links = Api\Link::get_links('infolog',$this->info_id,'projectmanager');
$this->assertEquals(1, count($pm_links));
}
finally
{
// Delete new
$this->deleteProject();
// Reset for cleanup
$this->pm_id = $first_pm_id;
}
}
public function testClearProject()
{
// Saving the infolog should try to send a notification
@ -433,10 +511,10 @@ class SetProjectManagerTest extends \EGroupware\Api\AppTest
/**
* Make a project so we can test deleting it
*/
protected function makeProject()
protected function makeProject($pm_number = '')
{
$project = array(
'pm_number' => 'TEST',
'pm_number' => 'TEST' . ($pm_number ? " $pm_number" : ''),
'pm_title' => 'Auto-test for ' . $this->getName(),
'pm_status' => 'active',
'pm_description' => 'Test project for ' . $this->getName()