extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar et2 bugs:

Browse Source 
- Fix holiday & timezone admin screens 
- Fix sometimes not shown events when there are more than one on a day
- Fix resource names not always shown in grid labels
This commit is contained in:
Nathan Gray 2015-08-12 16:37:02 +00:00
parent 7cf81c70b7
commit 5090c767c5
5 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_timezones.inc.php
View File

@ -374,7 +374,7 @@ class calendar_timezones
}
$output .= '<h3>'.self::import_tz_aliases()."</h3>\n";
$GLOBALS['egw']->framework->render($output, lang('Update timezones'), true);
$GLOBALS['egw']->framework->render($output, lang('Update timezones'), false);
}
/**

1
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -2479,6 +2479,7 @@ class calendar_uiforms extends calendar_ui
$GLOBALS['egw_info']['flags']['app_header'] = lang('Calendar').' - '.lang('Category ACL');
$tmp = new etemplate_new('calendar.cat_acl');
$GLOBALS['egw_info']['flags']['nonavbar'] = 1;
$tmp->exec('calendar.calendar_uiforms.cat_acl',$content,null,$readonlys,$preserv);
}

1
calendar/inc/class.uiholiday.inc.php
View File

@ -70,7 +70,6 @@
unset($GLOBALS['egw_info']['flags']['noheader']);
unset($GLOBALS['egw_info']['flags']['nonavbar']);
$GLOBALS['egw_info']['flags']['noappfooter'] = True;
common::egw_header();
$p = &$GLOBALS['egw']->template;
$p->set_file(Array('locales'=>'locales.tpl'));

15
calendar/js/app.js
View File

@ -1493,7 +1493,7 @@ app.classes.calendar = AppJS.extend(
grid.iterateOver(function(widget) {
if(widget.set_show_weekend)
{
widget.set_show_weekend(view.show_weekend(state));
widget.set_show_weekend(view.show_weekend(state.state));
}
},this, et2_valueWidget);
}
@ -1537,12 +1537,7 @@ app.classes.calendar = AppJS.extend(
// Toggle todos
if(state.state.view == 'day')
{
if(state.state.owner.length !== 1)
{
$j(view.etemplates[1].DOMContainer).hide();
view.etemplates[0].widgetContainer.set_width("");
}
else
if(state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] > 0)
{
view.etemplates[0].widgetContainer.set_width("70%");
// TODO: Maybe some caching here
@ -1551,6 +1546,11 @@ app.classes.calendar = AppJS.extend(
this.getWidgetById('todos').set_value({content:data.todos||''});
},view.etemplates[1].widgetContainer);
}
else
{
$j(view.etemplates[1].DOMContainer).hide();
view.etemplates[0].widgetContainer.set_width("");
}
}
else
{
@ -2058,6 +2058,7 @@ app.classes.calendar = AppJS.extend(
// Here we look for things like owner: ['r1,r2'] and change them
// to owner: ['r1','r2']
state[this.name.replace('[]','')] = $j(this).val();
$j('option', this).removeAttr('selected');
for(var key in state)
{
if(state[key] && typeof state[key].length !== 'undefined')

18
calendar/js/et2_widget_timegrid.js
View File

@ -544,9 +544,12 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
if(typeof this.value[this.day_list[i]] === 'undefined')
{
var ids = (egw.dataGetUIDdata(app.classes.calendar._daywise_cache_id(this.day_list[i],this.options.owner))||{data:[]});
for(var j = 0; j < ids.data.length; j++)
if(ids.data.length > 0)
{
this.value[this.day_list[i]] = [];
}
for(var j = 0; j < ids.data.length; j++)
{
if(egw.dataHasUID('calendar::'+ids.data[j]))
{
this.value[this.day_list[i]].push(egw.dataGetUIDdata('calendar::'+ids.data[j]).data);
@ -1014,6 +1017,19 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
break;
}
}
else if (typeof _owner == 'object' && _owner.length)
{
this.owner.options.application = false;
var owner_objected = [];
for(var i = 0; i < _owner.length; i++)
{
owner_objected[i] = {
app: _owner[i][0] == 'r' ? 'resources' : 'home-accounts',
id: isNaN(_owner[i]) ? _owner[i].substr(1) : _owner[i]
};
}
this.owner.set_value(owner_objected);
}
else
{
this.owner.options.application = 'home-accounts'