mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-19 13:10:58 +01:00
keep automatic update of pricelist, if project get updated
This commit is contained in:
parent
947bbf4f17
commit
3a5975e1aa
@ -1689,7 +1689,12 @@ class infolog_ui
|
||||
$app = $content['info_contact']['app'];
|
||||
$id = $content['info_contact']['id'];
|
||||
}
|
||||
if($app && $id)
|
||||
// if project has been removed, but is still info_contact --> also remove it
|
||||
if ($app == 'projectmanager' && $id && $id == $content['old_pm_id'] && !$content['pm_id'])
|
||||
{
|
||||
unset($content['info_link_id'], $id, $content['info_contact']['id']);
|
||||
}
|
||||
elseif ($app && $id)
|
||||
{
|
||||
if(!is_array($content['link_to']))
|
||||
{
|
||||
@ -1762,8 +1767,8 @@ class infolog_ui
|
||||
{
|
||||
//echo "<p>this->link->unlink2(0,infolog,{$content['link_to']['to_id']},0,'projectmanager',{$content['old_pm_id']});</p>\n";
|
||||
egw_link::unlink2(0,infolog,$content['link_to']['to_id'],0,'projectmanager',$content['old_pm_id']);
|
||||
$content['old_pm_id'] = $content['pm_id'];
|
||||
}
|
||||
$content['old_pm_id'] = $content['pm_id'];
|
||||
}
|
||||
// writing links for a new entry
|
||||
if ($info_id && is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
|
||||
|
@ -558,5 +558,18 @@ app.classes.infolog = AppJS.extend(
|
||||
var data = egw.dataGetUIDdata(_selected[0].id);
|
||||
|
||||
return data && data.data && data.data.info_id_parent > 0;
|
||||
},
|
||||
|
||||
/**
|
||||
* Submit template if widget has a value
|
||||
*
|
||||
* Used for project-selection to update pricelist items from server
|
||||
*
|
||||
* @param {DOMNode} _node
|
||||
* @param {et2_widget} _widget
|
||||
*/
|
||||
submit_if_not_empty: function(_node, _widget)
|
||||
{
|
||||
if (_widget.get_value()) this.et2._inst.submit();
|
||||
}
|
||||
});
|
||||
|
@ -41,7 +41,7 @@
|
||||
</row>
|
||||
<row class="row">
|
||||
<description value="Project"/>
|
||||
<link-entry id="pm_id" only_app='projectmanager' blur='None' class="infolog_projectName"/>
|
||||
<link-entry id="pm_id" only_app='projectmanager' onchange="app.infolog.submit_if_not_empty" blur="None" class="infolog_projectName"/>
|
||||
</row>
|
||||
<row class="row">
|
||||
<description value="Price"/>
|
||||
|
Loading…
Reference in New Issue
Block a user