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

Fix project / project link getting lost if you change the info contact from project

Browse Source
This commit is contained in:
nathangray 2017-12-08 12:54:10 -07:00
parent 869d8ed6b6
commit b0580fa09a
2 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1111,6 +1111,11 @@ class infolog_bo
$app,$id $app,$id
)); ));
$values['info_from'] = Link::title($app, $id); $values['info_from'] = Link::title($app, $id);
if($values['pm_id'])
{
// They just changed the contact, don't clear the project
unset($old_link_id);
}
} }
else if ($from) else if ($from)
{ {

75
infolog/tests/SetProjectManagerTest.php
View File

@ -322,6 +322,10 @@ class SetProjectManagerTest extends \EGroupware\Api\AppTest
$this->checkElements(); $this->checkElements();
} }
/**
* Test that loading a project set in the contact gets loaded with pm_id
* set.
*/
public function testLoadWithProject() public function testLoadWithProject()
{ {
// Saving the infolog should try to send a notification // Saving the infolog should try to send a notification
@ -359,7 +363,11 @@ class SetProjectManagerTest extends \EGroupware\Api\AppTest
$this->checkElements(); $this->checkElements();
} }
public function testChangeProject() /**
* Test that you can change from one project to another without overwriting
* the set info_contact.
*/
public function testChangeProjectWithContactSet()
{ {
// Saving the infolog should try to send a notification // Saving the infolog should try to send a notification
$this->bo->tracking->expects($this->exactly(2)) $this->bo->tracking->expects($this->exactly(2))
@ -437,6 +445,71 @@ class SetProjectManagerTest extends \EGroupware\Api\AppTest
} }
} }
/**
* Test free text in the contact field
*/
public function testChangeContactWithProjectStillSet()
{
$info = $this->getTestInfolog();
// Set up the test - just set info_contact to the project
$info['info_contact'] = array(
'app' => 'projectmanager',
'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();
$info = $this->bo->read($this->info_id);
// Check project
$this->checkElements();
// Now set info_contact to be a contact
$info['info_contact'] = array(
'app' => 'addressbook',
// Linking to current user's contact
'id' => $GLOBALS['egw_info']['user']['person_id'],
);
$this->bo->write($info);
// 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 properly set
$this->assertNotNull($info['pm_id'], 'Project got lost');
$this->assertEquals($this->pm_id, $info['pm_id'], 'Project got changed');
// Check project
$this->checkElements();
// Check pm links (should be only 1)
$pm_links = Api\Link::get_links('infolog',$this->info_id,'projectmanager');
$this->assertEquals(1, count($pm_links));
// Check all links (should be contact & project)
$links = Api\Link::get_links('infolog',$this->info_id);
$this->assertEquals(2, count($links));
}
public function testClearProject() public function testClearProject()
{ {
// Saving the infolog should try to send a notification // Saving the infolog should try to send a notification