mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
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
This commit is contained in:
parent
fe42b206c5
commit
924bea48e5
@ -32,8 +32,8 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
|
|||||||
*/
|
*/
|
||||||
public function beforeSendToClient($cname, array $expand=null)
|
public function beforeSendToClient($cname, array $expand=null)
|
||||||
{
|
{
|
||||||
|
Framework::includeJS('/calendar/js/app.min.js');
|
||||||
Framework::includeCSS('calendar','calendar');
|
Framework::includeCSS('calendar', 'calendar');
|
||||||
|
|
||||||
$bo = new calendar_bo();
|
$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);
|
$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();
|
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'));
|
@ -109,4 +109,4 @@ export class CalendarOwner extends Et2Select
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
customElements.define("calendar-owner", CalendarOwner);
|
customElements.define("et2-calendar-owner", CalendarOwner);
|
@ -36,7 +36,7 @@ return false;"/>
|
|||||||
<select id="status_filter" no_lang="true" class="et2_fullWidth"
|
<select id="status_filter" no_lang="true" class="et2_fullWidth"
|
||||||
onchange="app.calendar.update_state({status_filter: widget.getValue()});"/>
|
onchange="app.calendar.update_state({status_filter: widget.getValue()});"/>
|
||||||
<hrule/>
|
<hrule/>
|
||||||
<calendar-owner id="owner" class="et2_fullWidth"
|
<et2-calendar-owner id="owner" class="et2_fullWidth"
|
||||||
onchange="app.calendar.update_state({owner: widget.getValue()}); return false;"
|
onchange="app.calendar.update_state({owner: widget.getValue()}); return false;"
|
||||||
multiple="true" allowFreeEntries="false"
|
multiple="true" allowFreeEntries="false"
|
||||||
autocomplete_params="{"checkgrants": true}"/>
|
autocomplete_params="{"checkgrants": true}"/>
|
||||||
|
Loading…
Reference in New Issue
Block a user