Fix adding calendar participants did not give correct values due to missing type indicator

calendar/inc/class.calendar_owner_etemplate_widget.inc.php

@@ -77,8 +77,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 				// Add in group memberships as strings
 				$info['resources'] = array_map(function($a) { return ''.$a;},$GLOBALS['egw']->accounts->members($owner, true));
 			}
-
-			$option = array('value' => $owner, 'label' => $label, 'app' => lang($resource['app'])) + $info;
+			$option = static::format_owner($owner, $label, $info);
 			$sel_option_index = $this->get_index($sel_options, 'value', $owner);
 			if($sel_option_index === false)
 			{
@@ -283,7 +282,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 		$type = $data['type'];
 
 		$value = array(
-			'value' => $id,
+			'value' => substr($id, 0, -1) == $type ? $id : $type . $id,
 			'label' => $title,
 			'app'   => lang($data['app'])
 		);

calendar/js/CalendarOwner.ts

@@ -54,6 +54,8 @@ export class CalendarOwner extends Et2Select
 		// If parent didn't find a label, label will be the same as ID so we
 		// can find them that way
 		let missing_labels = [];
+		this.updateComplete.then(() =>
+		{
 			for(var i = 0; i < this.value.length; i++)
 			{
 				if(!this.menuItems.find(o => o.value == this.value[i]))
@@ -87,6 +89,7 @@ export class CalendarOwner extends Et2Select
 					this.updateComplete.then(() => {this.syncItemsFromValue();});
 				}, this, true, this).sendRequest();
 			}
+		});
 	}
 
 	/**

calendar/js/app.ts

@@ -2788,17 +2788,17 @@ export class CalendarApp extends EgwApp
 						state.state.owner = jQuery.map(state.state.owner, function(owner) {return owner;});
 					}
 			}
-			// Remove duplicates
-			state.state.owner = state.state.owner.filter(function(value, index, self) {
-				return self.indexOf(value) === index;
-			});
-			// Make sure they're all strings
-			state.state.owner = state.state.owner.map(function(owner) { return ''+owner;});
-
 			if(state.state.owner.indexOf('0') >= 0)
 			{
 				state.state.owner[state.state.owner.indexOf('0')] = this.egw.user('account_id');
 			}
+			// Remove duplicates
+			state.state.owner = state.state.owner.filter(function(value, index, self)
+			{
+				return self.indexOf(value) === index;
+			});
+			// Make sure they're all strings
+			state.state.owner = state.state.owner.map(function(owner) { return '' + owner;});
 
 			// Show the correct number of grids
 			var grid_count = 0;

calendar/js/et2_widget_planner.ts

@@ -412,7 +412,8 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
 				var resource = null;
 				if(app.calendar && app.calendar.sidebox_et2 && app.calendar.sidebox_et2.getWidgetById('owner'))
 				{
-					options = app.calendar.sidebox_et2.getWidgetById('owner').select_options;
+					const owner = app.calendar.sidebox_et2.getWidgetById('owner')
+					options = [...owner.select_options, ...owner._selected_remote];
 				}
 				else
 				{