From 924bea48e5b6f8b371782704f0448f3b35ab0092 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Thu, 25 Aug 2022 10:07:39 -0600
Subject: [PATCH] Calendar: Fix some kanban problems - CalendarOwner
 webcomponent lacked et2- prefix - Make sure CalendarOwner TS code is loaded
 when component is used - Fix status filter was in changeable fields - Fix
 Priority filter was missing options

---
 .../inc/class.calendar_owner_etemplate_widget.inc.php     | 8 ++++----
 calendar/js/CalendarOwner.ts                              | 2 +-
 calendar/templates/default/sidebox.xet                    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
index 1833b1c5b2..f294c08aa3 100644
--- a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
+++ b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
@@ -32,8 +32,8 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 	 */
 	public function beforeSendToClient($cname, array $expand=null)
 	{
-
-		Framework::includeCSS('calendar','calendar');
+		Framework::includeJS('/calendar/js/app.min.js');
+		Framework::includeCSS('calendar', 'calendar');
 
 		$bo = new calendar_bo();
 
@@ -41,7 +41,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 
 		$value =& self::get_array(self::$request->content, $form_name);
 
-		if (!is_array(self::$request->sel_options[$form_name]))
+		if(!is_array(self::$request->sel_options[$form_name]))
 		{
 			self::$request->sel_options[$form_name] = array();
 		}
@@ -343,4 +343,4 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 	}
 }
 
-Etemplate\Widget::registerWidget(__NAMESPACE__ . '\\calendar_owner_etemplate_widget', array('calendar-owner'));
\ No newline at end of file
+Etemplate\Widget::registerWidget(__NAMESPACE__ . '\\calendar_owner_etemplate_widget', array('et2-calendar-owner'));
\ No newline at end of file
diff --git a/calendar/js/CalendarOwner.ts b/calendar/js/CalendarOwner.ts
index 0cda90ee3a..b85a9d5b69 100644
--- a/calendar/js/CalendarOwner.ts
+++ b/calendar/js/CalendarOwner.ts
@@ -109,4 +109,4 @@ export class CalendarOwner extends Et2Select
 	}
 }
 
-customElements.define("calendar-owner", CalendarOwner);
\ No newline at end of file
+customElements.define("et2-calendar-owner", CalendarOwner);
\ No newline at end of file
diff --git a/calendar/templates/default/sidebox.xet b/calendar/templates/default/sidebox.xet
index 6d83e5b720..259088ad9c 100644
--- a/calendar/templates/default/sidebox.xet
+++ b/calendar/templates/default/sidebox.xet
@@ -36,10 +36,10 @@ return false;"/>
             <select id="status_filter" no_lang="true" class="et2_fullWidth"
                     onchange="app.calendar.update_state({status_filter: widget.getValue()});"/>
             <hrule/>
-            <calendar-owner id="owner" class="et2_fullWidth"
-                            onchange="app.calendar.update_state({owner: widget.getValue()}); return false;"
-                            multiple="true" allowFreeEntries="false"
-                            autocomplete_params="{&quot;checkgrants&quot;: true}"/>
+            <et2-calendar-owner id="owner" class="et2_fullWidth"
+                                onchange="app.calendar.update_state({owner: widget.getValue()}); return false;"
+                                multiple="true" allowFreeEntries="false"
+                                autocomplete_params="{&quot;checkgrants&quot;: true}"/>
             <hrule/>
             <select id="merge" empty_label="Insert in document" onchange="app.calendar.sidebox_merge"
                     class="et2_fullWidth"/>