class.calendar_uiforms.inc.php

nathangray 2016-04-27 18:53:15 UTC #1

Author: nathangray
New Revision: 55899

URL: http://svn.stylite.de/viewvc/egroupware?rev=55899&view=rev
Log:
Avoid empty popup & cryptic error from drag and drop series in the past with future conflict

Modified:
trunk/calendar/inc/class.calendar_uiforms.inc.php

Modified: trunk/calendar/inc/class.calendar_uiforms.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_uiforms.inc.php?rev=55899&r1=55898&r2=55899&view=diff

— trunk/calendar/inc/class.calendar_uiforms.inc.php (original)
+++ trunk/calendar/inc/class.calendar_uiforms.inc.php Wed Apr 27 20:53:15 2016
@@ -713,7 +713,7 @@
if ($event[‘recur_type’] != MCAL_RECUR_NONE)
{
$update_type = ‘edit’;

  				// we edit a existing series event
  				if ($event['start'] != $old_event['start'] ||
  					$event['whole_day'] != $old_event['whole_day'] ||

@@ -2567,7 +2567,8 @@
function ajax_moveEvent($_eventId,$calendarOwner,$targetDateTime,$targetOwner,$durationT=null,$seriesInstance=null)
{
list($eventId, $date) = explode(’:’, $_eventId,2);

```
  $ignore_conflicts = false;
```

  // we do not allow dragging into another users calendar ATM
  if($targetOwner < 0)
  {

@@ -2654,6 +2655,9 @@
// We have a recurring event starting in the past -
// stop it & create a new one.
$this->_break_recurring($event, $old_event, $this->bo->date2ts($targetDateTime));
+

  	// Can't handle conflict.  Just ignore it.

  	$ignore_conflicts = true;
  }
  if(!$event['recur_type'])
  {

@@ -2704,8 +2708,8 @@
}

	$message = false;

  $conflicts=$this->bo->update($event,false, true, false, true, $message);

  $conflicts=$this->bo->update($event,$ignore_conflicts, true, false, true, $message);

  $this->update_client($event['id'],$d);
  $response = egw_json_response::get();
  if(!is_array($conflicts) && $conflicts)

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs