Merge remote-tracking branch 'origin/master'

Intermesh · Nov 4, 2024 · ce2870f · ce2870f
2 parents f03c445 + 1498b1c
commit ce2870f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
+04-11-2024: 6.8.81
 - Core: Admin can change passwords without using own password again
 - Email: Set references header when forwarding mail
 - Newsletters: fix php compatibility error when sending newsletters
+- Supportclient: make creation dialog wider to fit format toolbar
+- Calendar: fix more HTML encoding issues in Qtip
 
 28-10-2024: 6.8.80
 - Core: bugfix editing individual field set in entity

diff --git a/www/modules/calendar/Calendar.js b/www/modules/calendar/Calendar.js
@@ -48,7 +48,8 @@ GO.calendar.formatQtip = function(data,verbose)
 		str += '<br />'+t("Status", "calendar")+': ';
 
 		if(t("statuses", "calendar")[data.status]){
-			str+=Ext.util.Format.htmlEncode(t("statuses", "calendar")[data.status]);
+			// str+=Ext.util.Format.htmlEncode(t("statuses", "calendar")[data.status]);
+			str+=t("statuses", "calendar")[data.status];
 		}else
 		{
 			str+=data.status;
@@ -57,12 +58,14 @@ GO.calendar.formatQtip = function(data,verbose)
 
 	if(!GO.util.empty(data.calendar_name))
 	{
-		str += '<br />'+t("Calendar", "calendar")+': '+Ext.util.Format.htmlEncode(data.calendar_name);
+		// str += '<br />'+t("Calendar", "calendar")+': '+Ext.util.Format.htmlEncode(data.calendar_name);
+		str += '<br />'+t("Calendar", "calendar")+': '+data.calendar_name;
 	}
 
 	if(!GO.util.empty(data.username))
 	{
-		str += '<br />'+t("Owner")+': '+Ext.util.Format.htmlEncode(data.username);
+		// str += '<br />'+t("Owner")+': '+Ext.util.Format.htmlEncode(data.username);
+		str += '<br />'+t("Owner")+': '+data.username;
 	}
 
 	str += '<br />'+t("Created at")+': '+data.creationDate.format(GO.settings.date_format+' '+GO.settings.time_format);
@@ -71,12 +74,14 @@ GO.calendar.formatQtip = function(data,verbose)
 
 	if(verbose && !GO.util.empty(data.musername))
 	{
-		str += '<br />'+t("Modified by")+': '+Ext.util.Format.htmlEncode(data.musername);
+		// str += '<br />'+t("Modified by")+': '+Ext.util.Format.htmlEncode(data.musername);
+		str += '<br />'+t("Modified by")+': '+data.musername;
 	}
 
 	if(!GO.util.empty(data.location))
 	{
-		str += '<br />'+t("Location", "calendar")+': '+Ext.util.Format.htmlEncode(data.location);
+		// str += '<br />'+t("Location", "calendar")+': '+Ext.util.Format.htmlEncode(data.location);
+		str += '<br />'+t("Location", "calendar")+': '+data.location;
 	}
 
 	if(!GO.util.empty(data.description))
@@ -87,12 +92,14 @@ GO.calendar.formatQtip = function(data,verbose)
 	if (!GO.util.empty(data.resources)) {
 		str += '<br />'+t("Used resources", "calendar")+':';
 		for (var i in data.resources)
-			str += '<br /> - '+Ext.util.Format.htmlEncode(data.resources[i]);
+			// str += '<br /> - '+Ext.util.Format.htmlEncode(data.resources[i]);
+			str += '<br /> - '+data.resources[i];
 	}
 
 	if (!GO.util.empty(data.resourced_calendar_name))
-		str += '<br />'+t("Resource used in", "calendar")+': '+Ext.util.Format.htmlEncode(data.resourced_calendar_name);
-
+		// str += '<br />'+t("Resource used in", "calendar")+': '+Ext.util.Format.htmlEncode(data.resourced_calendar_name);
+		str += '<br />'+t("Resource used in", "calendar")+': '+data.resourced_calendar_name;
+
 	return Ext.util.Format.htmlEncode(str);
 }
 

diff --git a/www/modules/calendar/model/Event.php b/www/modules/calendar/model/Event.php
@@ -2233,6 +2233,7 @@ public function duplicateRelation($relationName, $duplicate, array $attributes=a
 		if($relationName == 'participants' && isset($attributes['participants']) && $attributes['participants'] === null) {
 			return;
 		}
+		parent::duplicateRelation($relationName, $duplicate, $attributes, $findParams);
 	}
 
 	/**

diff --git a/www/version.php b/www/version.php
@@ -1,2 +1,2 @@
 <?php
-return "6.8.80";
+return "6.8.81";
-Original file line number
+Diff line change
@@ Expand Up @@
     		if($relationName == 'participants' && isset($attributes['participants']) && $attributes['participants'] === null) {
     			return;
     		}
+    		parent::duplicateRelation($relationName, $duplicate, $attributes, $findParams);
     	}
     	/**
@@ Expand Down @@