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

keep automatic update of pricelist, if project get updated

Browse Source
This commit is contained in:
Ralf Becker 2015-03-10 12:21:19 +00:00
parent 947bbf4f17
commit 3a5975e1aa
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infolog/inc/class.infolog_ui.inc.php
View File

@ -1689,7 +1689,12 @@ class infolog_ui
$app = $content['info_contact']['app']; $app = $content['info_contact']['app'];
$id = $content['info_contact']['id']; $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'])) 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"; //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']); 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 // writing links for a new entry
if ($info_id && is_array($content['link_to']['to_id']) && count($content['link_to']['to_id'])) if ($info_id && is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))

13
infolog/js/app.js
View File

@ -558,5 +558,18 @@ app.classes.infolog = AppJS.extend(
var data = egw.dataGetUIDdata(_selected[0].id); var data = egw.dataGetUIDdata(_selected[0].id);
return data && data.data && data.data.info_id_parent > 0; 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();
} }
}); });

2
infolog/templates/default/edit.xet
View File

@ -41,7 +41,7 @@
</row> </row>
<row class="row"> <row class="row">
<description value="Project"/> <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>
<row class="row"> <row class="row">
<description value="Price"/> <description value="Price"/>