Skip to content

Commit 722abe9

Browse files
tpurschketpurschke
authored
Merge pull request CactuseSecurity#2793 from SolidProgramming/Issue_2786
Merge for issue CactuseSecurity#2786
2 parents 2a5d3ca + ab79d04 commit 722abe9

16 files changed

+68
-40
lines changed

‎roles/database/files/sql/idempotent/fworch-texts.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,6 +2255,8 @@ INSERT INTO txt VALUES ('allowServiceInConn', 'German', 'Einfache Dienste in
22552255
INSERT INTO txt VALUES ('allowServiceInConn', 'English', 'Allow Simple Services in Connection');
22562256
INSERT INTO txt VALUES ('overviewDisplayLines', 'German', 'Max. Anzahl Zeilen in Übersicht');
22572257
INSERT INTO txt VALUES ('overviewDisplayLines', 'English', 'Max. Number of Rows in Overview');
2258+
INSERT INTO txt VALUES ('maxModellingTableRows', 'German', 'Max. Anzahl Zeilen in Tabellen');
2259+
INSERT INTO txt VALUES ('maxModellingTableRows', 'English', 'Max. Number of Rows in Tables');
22582260
INSERT INTO txt VALUES ('reducedProtocolSet', 'German', 'Reduzierten Protokollset darstellen');
22592261
INSERT INTO txt VALUES ('reducedProtocolSet', 'English', 'Display reduced Protocol set');
22602262
INSERT INTO txt VALUES ('importAppDataPath', 'German', 'Pfad und Name von Appdaten-Import (ohne Endung)');

‎roles/lib/files/FWO.Config.Api/Data/ConfigData.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,10 @@ public class ConfigData : ICloneable
334334
[JsonProperty("modExtraConfigs"), JsonPropertyName("modExtraConfigs")]
335335
public string ModExtraConfigs { get; set; } = "";
336336

337-
public ConfigData(bool editable = false)
337+
[JsonProperty("maxModellingTableRows"), JsonPropertyName("maxModellingTableRows")]
338+
public int MaxModellingTableRows { get; set; } = 10;
339+
340+
public ConfigData(bool editable = false)
338341
{
339342
Editable = editable;
340343
}

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAlerts.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
@if(InitComplete)
2020
{
2121
<div class="vheight75">
22-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
23-
<Table TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="Alert" Items="alertEntrys" PageSize="PageSize">
22+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
23+
<Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="Alert" Items="alertEntrys">
2424
<Column TableItem="Alert" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
2525
<Column TableItem="Alert" Title="@(userConfig.GetText("timestamp"))" Field="@(x => x.Timestamp)" Sortable="true" Filterable="true"/>
2626
<Column TableItem="Alert" Title="@(userConfig.GetText("source"))" Field="@(x => x.Source)" Sortable="true" Filterable="true"/>
@@ -55,7 +55,7 @@ else
5555
[CascadingParameter]
5656
Action<Exception?, string, string, bool> DisplayMessageInUi { get; set; } = DefaultInit.DoNothing;
5757

58-
private int PageSize { get; set; } = 10;
58+
private int PageSize { get; set; }
5959

6060
private List<Alert> alertEntrys = [];
6161
private List<UiUser> uiUsers = [];

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAll.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
@if(InitComplete)
1515
{
1616
<div class="vheight75">
17-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
18-
<Table TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys" PageSize="PageSize">
17+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
18+
<Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
1919
<Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
2020
<Column TableItem="LogEntry" Title="@(userConfig.GetText("source"))" Field="@(x => x.Source)" Sortable="true" Filterable="true"/>
2121
<Column TableItem="LogEntry" Title="@(userConfig.GetText("severity"))" Field="@(x => x.Severity)" Sortable="true" Filterable="true"/>
@@ -51,7 +51,7 @@ else
5151
private List<LogEntry> logEntrys = new List<LogEntry>();
5252
private bool InitComplete = false;
5353

54-
private int PageSize { get; set; } = 10;
54+
private int PageSize { get; set; }
5555

5656
protected override async Task OnInitializedAsync()
5757
{

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAutodiscoveryLog.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
@if(InitComplete)
1717
{
1818
<div class="vheight75">
19-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
20-
<Table TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys" PageSize="PageSize">
19+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
20+
<Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
2121
<Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
2222
<Column TableItem="LogEntry" Title="@(userConfig.GetText("timestamp"))" Field="@(x => x.Timestamp)" Sortable="true" Filterable="true"/>
2323
<Column TableItem="LogEntry" Title="@(userConfig.GetText("found_by"))" Field="@(x => x.UserId)" Sortable="true">
@@ -55,7 +55,7 @@ else
5555
private List<Management> managements = [];
5656
private bool InitComplete = false;
5757

58-
private int PageSize { get; set; } = 10;
58+
private int PageSize { get; set; }
5959

6060
protected override async Task OnInitializedAsync()
6161
{

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorDailyChecks.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
@if(InitComplete)
1616
{
1717
<div class="vheight75">
18-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
19-
<Table TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys" PageSize="PageSize">
18+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
19+
<Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
2020
<Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
2121
<Column TableItem="LogEntry" Title="@(userConfig.GetText("timestamp"))" Field="@(x => x.Timestamp)" Sortable="true" Filterable="true"/>
2222
<Column TableItem="LogEntry" Title="@(userConfig.GetText("severity"))" Field="@(x => x.Severity)" Sortable="true" Filterable="true"/>
@@ -42,7 +42,7 @@ else
4242
private List<LogEntry> logEntrys = new List<LogEntry>();
4343
private bool InitComplete = false;
4444

45-
private int PageSize { get; set; } = 10;
45+
private int PageSize { get; set; }
4646

4747
protected override async Task OnInitializedAsync()
4848
{

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorExternalRequestTickets.razor‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
{
2626
<SelectOwner SelectedOwner="actOwner" SelectedOwnerChanged="FetchOwnerData" Apps="allOwners" />
2727
<div class="m-2 vheight75">
28-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
29-
<Table class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="OwnerTicket" Items="ownerTickets" PageSize="PageSize" ColumnReorder="true">
28+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
29+
<Table PageSize="PageSize" class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="OwnerTicket" Items="ownerTickets" ColumnReorder="true">
3030
<Column TableItem="OwnerTicket" Title="@(userConfig.GetText("actions"))" Field="(x => x.Ticket.Id)" Sortable="false" Filterable="false">
3131
<Template>
3232
<div class="btn-group">
@@ -82,7 +82,7 @@ else
8282
<label class="col-sm-3 col-form-label col-form-label-sm">@(userConfig.GetText("creation_date")):</label>
8383
<label class="col-sm-8">@actOwnerTicket.Ticket.CreationDate</label>
8484
</div>
85-
<Table class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="WfReqTask" Items="actOwnerTicket.Ticket.Tasks.OrderBy(x => x.TaskNumber).ToList()" PageSize="PageSize" ColumnReorder="true">
85+
<Table class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="WfReqTask" Items="actOwnerTicket.Ticket.Tasks.OrderBy(x => x.TaskNumber).ToList()" ColumnReorder="true">
8686
<Column TableItem="WfReqTask" Title="@(userConfig.GetText("number"))" Field="@(x => x.TaskNumber)" Sortable="true" Filterable="true" />
8787
<Column TableItem="WfReqTask" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true" />
8888
<Column TableItem="WfReqTask" Title="@(userConfig.GetText("title"))" Field="@(x => x.Title)" Sortable="true" Filterable="true" />
@@ -130,7 +130,7 @@ else
130130
private bool DetailsMode = false;
131131
private bool ReInitMode = false;
132132

133-
private int PageSize { get; set; } = 10;
133+
private int PageSize { get; set; }
134134
private bool workInProgress = false;
135135

136136
private static readonly List<string> relevantRequestStates =

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorExternalRequests.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<label for="cbx_show_all" class="form-check-label">@(userConfig.GetText("show_all"))</label>
3434
</div>
3535
</div>
36-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
37-
<Table class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="ExternalRequest" Items="openRequests" PageSize="PageSize" ColumnReorder="true">
36+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
37+
<Table PageSize="PageSize" class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="ExternalRequest" Items="openRequests" ColumnReorder="true">
3838
<Column TableItem="ExternalRequest" Title="@(userConfig.GetText("actions"))" Field="(x => x.Id)" Sortable="false" Filterable="false">
3939
<Template Context="request">
4040
<div class="btn-group">
@@ -197,7 +197,7 @@ else
197197
private bool DetailsMode = false;
198198
private bool ChangeStateMode = false;
199199

200-
private int PageSize { get; set; } = 10;
200+
private int PageSize { get; set; }
201201
private bool workInProgress = false;
202202
private bool displayAll = false;
203203

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorImportLog.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
@if(InitComplete)
1616
{
1717
<div class="vheight75">
18-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
19-
<Table TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys" PageSize="PageSize">
18+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
19+
<Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
2020
<Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
2121
<Column TableItem="LogEntry" Title="@(userConfig.GetText("severity"))" Field="@(x => x.Severity)" Sortable="true" Filterable="true"/>
2222
<Column TableItem="LogEntry" Title="@(userConfig.GetText("description"))" Field="@(x => x.Description)" Sortable="true" Filterable="true"/>
@@ -49,7 +49,7 @@ else
4949
private List<LogEntry> logEntrys = new List<LogEntry>();
5050
private bool InitComplete = false;
5151

52-
private int PageSize { get; set; } = 10;
52+
private int PageSize { get; set; }
5353

5454
protected override async Task OnInitializedAsync()
5555
{

‎roles/ui/files/FWO.UI/Pages/Monitoring/MonitorImportStatus.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
@if(InitComplete)
2222
{
2323
<div class="m-2 vheight75">
24-
<PageSizeComponent PageSizeCallback="UpdatePageSize" PageSize="PageSize"></PageSizeComponent>
25-
<Table class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="ImportStatus" Items="sortedImportStati" PageSize="PageSize" ColumnReorder="true" TableRowClass="@(stat => getTableRowClass(stat))">
24+
<PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
25+
<Table PageSize="PageSize" class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="ImportStatus" Items="sortedImportStati" ColumnReorder="true" TableRowClass="@(stat => getTableRowClass(stat))">
2626
<Column TableItem="ImportStatus" Title="@(userConfig.GetText("actions"))" Field="(x => x.MgmId)" Sortable="false" Filterable="false">
2727
<Template>
2828
<div class="btn-group">
@@ -109,7 +109,7 @@ else
109109
private ImportStatus actStatus = new ImportStatus();
110110
private bool InitComplete = false;
111111

112-
private int PageSize { get; set; } = 10;
112+
private int PageSize { get; set; }
113113

114114
protected override async Task OnInitializedAsync()
115115
{

0 commit comments

Comments
 (0)