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

Check contact duplication of addressbooks with presets

Browse Source 
-Fix addressbook contacts added by add contact plus do not get checked for duplication
-Fix another CSP error
This commit is contained in:
Hadi Nategh 2014-10-13 13:33:10 +00:00
parent bde32aaeeb
commit 639a1b6c03
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1717,6 +1717,11 @@ window.egw_LAB.wait(function() {
{
case 'save':
case 'apply':
if ($content['presets_fields'])
{
// unset the duplicate_filed after submit because we don't need to warn user for second time about contact duplication
unset($content['presets_fields']);
}
if ($content['delete_photo'])
{
$content['jpegphoto'] = null;
@ -1985,7 +1990,9 @@ window.egw_LAB.wait(function() {
{
if (!empty($content[$field]))
{
egw_framework::set_onload("app.addressbook.check_value(document.getElementById('exec[$field]'),0);");
//Set the presets fields in content in order to be able to use them later in client side for checking duplication only on first time load
// after save/apply we unset them
$content['presets_fields'][]= $field;
break;
}
}

8
addressbook/js/app.js
View File

@ -66,6 +66,14 @@ app.classes.addressbook = AppJS.extend(
window.app.infolog = new window.app.classes.infolog();
}
}
// Call check value if the AB got opened with presets
if (window.location.href.match(/&presets\[email\]/g) && content.presets_fields)
{
for(var i=0;i< content.presets_fields.length;i++)
{
this.check_value(this.et2.getWidgetById(content.presets_fields),0);
}
}
break;
}