holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Fix some kanban problems

Browse Source 
- 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
This commit is contained in:
nathan 2022-08-25 10:07:39 -06:00
parent fe42b206c5
commit 924bea48e5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_owner_etemplate_widget.inc.php
View File

@ -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'));
Etemplate\Widget::registerWidget(__NAMESPACE__ . '\\calendar_owner_etemplate_widget', array('et2-calendar-owner'));

2
calendar/js/CalendarOwner.ts
View File

@ -109,4 +109,4 @@ export class CalendarOwner extends Et2Select
}
}
customElements.define("calendar-owner", CalendarOwner);
customElements.define("et2-calendar-owner", CalendarOwner);

8
calendar/templates/default/sidebox.xet
View File

@ -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"/>