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

Make sure we reset filter or not setting it when choosing select All

Browse Source
This commit is contained in:
Hadi Nategh 2020-08-20 13:53:45 +02:00
parent a7e611af5f
commit 6b910cc5fe
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -707,7 +707,7 @@ class timesheet_ui extends timesheet_bo
} }
} }
// Update start / end dates for custom // Update start / end dates for custom
if($query_in['filter'] != 'custom' && Api\Json\Response::isJSONResponse()) if($query_in['filter'] != '0' && $query_in['filter'] != 'custom' && Api\Json\Response::isJSONResponse())
{ {
Api\Json\Response::get()->call( Api\Json\Response::get()->call(
'app.timesheet.update_timespan', 'app.timesheet.update_timespan',

3
timesheet/js/app.js
View File

@ -63,8 +63,11 @@ var TimesheetApp = /** @class */ (function (_super) {
TimesheetApp.prototype.filter_change = function () { TimesheetApp.prototype.filter_change = function () {
var filter = this.et2.getWidgetById('filter'); var filter = this.et2.getWidgetById('filter');
var dates = this.et2.getWidgetById('timesheet.index.dates'); var dates = this.et2.getWidgetById('timesheet.index.dates');
var nm = this.et2.getDOMWidgetById('nm');
if (filter && dates) { if (filter && dates) {
dates.set_disabled(filter.get_value() !== "custom"); dates.set_disabled(filter.get_value() !== "custom");
if (filter.get_value() == 0)
nm.activeFilters.startdate = null;
if (filter.value == "custom") { if (filter.value == "custom") {
jQuery(this.et2.getWidgetById('startdate').getDOMNode()).find('input').focus(); jQuery(this.et2.getWidgetById('startdate').getDOMNode()).find('input').focus();
} }

3
timesheet/js/app.ts
View File

@ -61,10 +61,11 @@ class TimesheetApp extends EgwApp
{ {
var filter = this.et2.getWidgetById('filter'); var filter = this.et2.getWidgetById('filter');
var dates = this.et2.getWidgetById('timesheet.index.dates'); var dates = this.et2.getWidgetById('timesheet.index.dates');
let nm = this.et2.getDOMWidgetById('nm');
if (filter && dates) if (filter && dates)
{ {
dates.set_disabled(filter.get_value() !== "custom"); dates.set_disabled(filter.get_value() !== "custom");
if (filter.get_value() == 0) nm.activeFilters.startdate = null;
if (filter.value == "custom") if (filter.value == "custom")
{ {
jQuery(this.et2.getWidgetById('startdate').getDOMNode()).find('input').focus(); jQuery(this.et2.getWidgetById('startdate').getDOMNode()).find('input').focus();