From 3e7ecbe692ceab7f7a2c47f19436472cc9642a37 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 2 Mar 2018 10:55:06 -0700
Subject: [PATCH] * Calendar - always show non-blocking icon for non-blocking
 events, regardless of private flag

---
 calendar/js/et2_widget_event.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index 2f197183db..0e94802598 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -620,10 +620,6 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
 				*/
 			}
 
-			if(this.options.value.non_blocking)
-			{
-				icons.push('<img src="'+this.egw().image('nonblocking','calendar')+'" title="'+this.egw().lang('non blocking')+'"/>');
-			}
 			if(this.options.value.alarm && !jQuery.isEmptyObject(this.options.value.alarm) && !this.options.value.is_private)
 			{
 				icons.push('<img src="'+this.egw().image('alarm','calendar')+'" title="'+this.egw().lang('alarm')+'"/>');
@@ -633,6 +629,12 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
 				icons.push('<img src="'+this.egw().image('needs-action','calendar')+'" title="'+this.egw().lang('Needs action')+'"/>');
 			}
 		}
+
+		// Always include non-blocking, regardless of privacy
+		if(this.options.value.non_blocking)
+		{
+			icons.push('<img src="'+this.egw().image('nonblocking','calendar')+'" title="'+this.egw().lang('non blocking')+'"/>');
+		}
 		return icons;
 	},