et2_widget_event.js

nathangray 2016-02-04 19:30:32 UTC #1

Author: nathangray
New Revision: 54924

URL: http://svn.stylite.de/viewvc/egroupware?rev=54924&view=rev
Log:
Fix changes via popup edit are not shown in main (week, etc) views

Modified:
trunk/calendar/inc/class.calendar_ui.inc.php
trunk/calendar/inc/class.calendar_uiforms.inc.php
trunk/calendar/js/et2_widget_event.js

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

— trunk/calendar/inc/class.calendar_ui.inc.php (original)
+++ trunk/calendar/inc/class.calendar_ui.inc.php Thu Feb 4 20:30:32 2016
@@ -696,14 +696,14 @@
if(!$event)
{
// Sending null will trigger a removal

  	$response->call('egw.dataStoreUID','calendar::'.$event_id,null);

  	$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => null));
  	return false;
  }

  if(!$event['recur_type'] || $recurrence_date)
  {
  	$this->to_client($event);

  	$response->call('egw.dataStoreUID','calendar::'.$event['row_id'],$event);

  	$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => $event));
  }
  // If it's recurring, try to send the next month or so
  else if($event['recur_type'] )

@@ -716,7 +716,7 @@
$occurrence = $rrule->current();
$converted = $this->bo->read($event[‘id’], $occurrence);
$this->to_client($converted);

  		$response->call('egw.dataStoreUID','calendar::'.$converted['row_id'],$converted);

  		$response->generic('data', array('uid' => 'calendar::'.$converted['row_id'], 'data' => $converted));
  		$rrule->next();
  	}
  	while ($rrule->valid() && $occurrence <= $this_month );

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=54924&r1=54923&r2=54924&view=diff

— trunk/calendar/inc/class.calendar_uiforms.inc.php (original)
+++ trunk/calendar/inc/class.calendar_uiforms.inc.php Thu Feb 4 20:30:32 2016
@@ -793,6 +793,12 @@
}
}
}

  		// Adding participants needs to be done as an edit, in case we

  		// have participants visible in seperate calendars

  		if(count(array_diff_key($event['participants'], $old_event['participants'])))

```
  		{
```
```
  			$update_type = 'edit';
```

  		}
  		$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
  		unset($event['ignore']);
  	}

Modified: trunk/calendar/js/et2_widget_event.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_event.js?rev=54924&r1=54923&r2=54924&view=diff

— trunk/calendar/js/et2_widget_event.js (original)
+++ trunk/calendar/js/et2_widget_event.js Thu Feb 4 20:30:32 2016
@@ -348,6 +348,9 @@
}
}

```
  // Clear tooltip for regeneration
```
```
  this.set_statustext('');
```

  // Height specific section
  this._small_size();

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

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