Bugs behoben.
This commit is contained in:
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Report;
|
||||
using BeWo.Service.Plugins;
|
||||
using BeWo.View.Navigation.Filter;
|
||||
@@ -173,10 +174,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
Model.AllTeamsForQueries = EmployeeService.GetAllActiveCompactTeamsForEmployee(null);
|
||||
|
||||
Model.AllServiceCategoriesForQueries = OperationsService.GetAllServiceCategories();
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
if (Model.HasRightToViewMitarbeiterstundenkonto)
|
||||
@@ -187,8 +185,6 @@ namespace BeWoPlanerMobil.Controllers
|
||||
Value = "1"
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#if !DEBUG
|
||||
Model.SelectedReportType = ReportType.Mitarbeiterstundenkonto;
|
||||
#endif
|
||||
@@ -585,6 +581,11 @@ namespace BeWoPlanerMobil.Controllers
|
||||
[Authorize]
|
||||
public ActionResult SelectQueryParameter(long? objectOid, int parameterType, long? parameterOid, string textValue)
|
||||
{
|
||||
if(Model?.SelectedQueryOid.HasValue ?? false)
|
||||
{
|
||||
Model.SelectedQuery = Model.Queries.FirstOrDefault(q => q.Oid.Equals(Model.SelectedQueryOid.Value));
|
||||
}
|
||||
|
||||
if(Model?.SelectedQuery is null)
|
||||
{
|
||||
TempData[TempDataConstants.DoLogoutKey] = true;
|
||||
|
||||
Reference in New Issue
Block a user