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

Merge remote-tracking branch 'origin/master' into admin_message_et2

Browse Source
This commit is contained in:
Hadi Nategh 2018-10-30 09:51:40 +01:00
commit c9c14fd4ae
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.addressbook_import_vcard.inc.php
View File

@ -163,12 +163,6 @@ class addressbook_import_vcard implements importexport_iface_import_plugin {
$record['owner'] = $owner;
// If photo is set, we want to update it
if($record['jpegphoto'])
{
$record['photo_unchanged'] = false;
}
// Check that owner (addressbook) is allowed
if(!array_key_exists($record['owner'], $this->bocontacts->get_addressbooks()))
{

3
addressbook/inc/class.addressbook_vcal.inc.php
View File

@ -145,6 +145,7 @@ class addressbook_vcal extends addressbook_bo
{
if (($old_contact = $this->read($_abID)))
{
$contact['photo_unchanged'] = $old_contact['jpegphoto'] === $contact['jpegphoto'];
if ($merge)
{
foreach (array_keys($contact) as $key)
@ -177,6 +178,8 @@ class addressbook_vcal extends addressbook_bo
}
else
{
// If photo is set, we want to update it
$contact['photo_unchanged'] = false;
if (is_array($contact['cat_id']))
{
$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));

4
calendar/js/et2_widget_timegrid.js
View File

@ -1603,14 +1603,14 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
this.div.removeClass('calendar_TimeGridNoLabel');
// Check to see if it's our own calendar, with just us showing
if(typeof _owner == 'object' && _owner.length == 1 && _owner[0] == this.egw().user('account_id'))
if(typeof _owner == 'object' && _owner.length == 1)
{
var rowCount = 0;
this._parent.iterateOver(function(widget) {
if(!widget.disabled) rowCount++;
},this, et2_calendar_timegrid);
// Just us, show week number
if(rowCount == 1) _owner = false;
if(rowCount == 1 || _owner.length == 1) _owner = false;
}
if(typeof _owner == 'string' && isNaN(_owner))