Merge pull request #2364 from abarz722/develop

Quick fixes
CactuseSecurity · Mar 21, 2024 · 1aa9a4c · 1aa9a4c
2 parents 6be36be + 883d621
commit 1aa9a4c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql
@@ -1762,8 +1762,8 @@ INSERT INTO txt VALUES ('customize_texts',		'German', 	'Texte anpassen');
 INSERT INTO txt VALUES ('customize_texts',		'English', 	'Customize Texts');
 INSERT INTO txt VALUES ('ignore_helptexts',		'German', 	'Hilfetexte ignorieren');
 INSERT INTO txt VALUES ('ignore_helptexts',		'English', 	'Ignore help texts');
-INSERT INTO txt VALUES ('case_sensitive',		'German', 	'');
-INSERT INTO txt VALUES ('case_sensitive',		'English', 	'Schreibungsabh&auml;ngig');
+INSERT INTO txt VALUES ('case_sensitive',		'German', 	'Schreibungsabh&auml;ngig');
+INSERT INTO txt VALUES ('case_sensitive',		'English', 	'Case Sensitive');
 INSERT INTO txt VALUES ('key',                  'German', 	'Schl&uuml;ssel');
 INSERT INTO txt VALUES ('key',                  'English', 	'Key');
 INSERT INTO txt VALUES ('text',                 'German', 	'Text');

diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor
@@ -23,7 +23,7 @@
                         {
                             <div class="form-group row">
                                 <label class="col-sm-3 col-form-label col-form-label-sm">@(userConfig.GetText("area"))*:</label>
-                                @if(AddMode && ! AppRoleHandler.ReadOnly)
+                                @if(AddMode && !AppRoleHandler.ReadOnly)
                                 {
                                     <div class="col-sm-8">
                                         <Dropdown ElementType="ModellingNetworkArea" SelectedElement="AppRoleHandler.ActAppRole.Area" ElementToString="@(a => a.Display())" 

diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor
@@ -270,7 +270,7 @@
     </div>
     <InProgress Display="workInProgress"/>
     <EditServiceGroup @bind-Display="ConnHandler.EditSvcGrpMode" @bind-SvcGroupHandler="ConnHandler.SvcGrpHandler" AddMode="false"/>
-    <EditAppRole @bind-Display="ConnHandler.EditAppRoleMode" @bind-AppRoleHandler="ConnHandler.AppRoleHandler" AddMode="false"/>
+    <EditAppRole @bind-Display="ConnHandler.DisplayAppRoleMode" @bind-AppRoleHandler="ConnHandler.AppRoleHandler" AddMode="false"/>
     <EditConnPopup @bind-Display="ConnHandler.DisplaySelectedInterfaceMode" ConnHandler="ConnHandler.IntConnHandler"/>
 }
 

diff --git a/roles/ui/files/FWO.UI/Pages/Reporting/Report.razor b/roles/ui/files/FWO.UI/Pages/Reporting/Report.razor
@@ -238,11 +238,14 @@
             {
                 actReportFilters.Init(userConfig, false);
                 injectedAppId = appId;
-                List<FwoOwner> owners = await apiConnection.SendQueryAsync<List<FwoOwner>>(Api.Client.Queries.OwnerQueries.getEditableOwners, new { appIds = appId });
-                if(owners.Count > 0)
+                if(showModellingReports)
                 {
-                    actReportFilters.ModellingFilter.SelectedOwner = owners.First();
-                    autoGenerateReport = true;
+                    List<FwoOwner> owners = await apiConnection.SendQueryAsync<List<FwoOwner>>(Api.Client.Queries.OwnerQueries.getEditableOwners, new { appIds = appId });
+                    if(owners.Count > 0)
+                    {
+                        actReportFilters.ModellingFilter.SelectedOwner = owners.First();
+                        autoGenerateReport = true;
+                    }
                 }
             }
             else

diff --git a/roles/ui/files/FWO.UI/Pages/Reporting/ReportModellingParamSelection.razor b/roles/ui/files/FWO.UI/Pages/Reporting/ReportModellingParamSelection.razor
@@ -6,7 +6,7 @@
 
 <div class="p-3">
     <h5 class="text-left">@(userConfig.GetText("owner"))</h5>
-    <Dropdown ElementType="FwoOwner" ElementToString="@(o => o.Display(userConfig.GetText("common_service")))" Nullable="true" 
+    <Dropdown ElementType="FwoOwner" ElementToString="@(o => o.Display(userConfig.GetText("common_service")))" Nullable="false" 
             @bind-SelectedElement="ModellingFilter.SelectedOwner" Elements="ownerList">
         <ElementTemplate Context="owner">
             @owner.Display(userConfig.GetText("common_service"))

diff --git a/roles/ui/files/FWO.UI/Pages/Reporting/ReportTemplateComponent.razor b/roles/ui/files/FWO.UI/Pages/Reporting/ReportTemplateComponent.razor
@@ -121,7 +121,7 @@
                 <div class="form-group row mt-2">
                     <label class="col-sm-3 col-form-label col-form-label-sm">@(userConfig.GetText("owner")):</label>
                     <div class="col-sm-8">
-                        <Dropdown ElementType="FwoOwner" ElementToString="@(o => o.Display(userConfig.GetText("common_service")))" Nullable="true" 
+                        <Dropdown ElementType="FwoOwner" ElementToString="@(o => o.Display(userConfig.GetText("common_service")))" Nullable="false" 
                                 @bind-SelectedElement="reportTemplateInEdit.ReportParams.ModellingFilter.SelectedOwner" Elements="modOwnerList">
                             <ElementTemplate Context="owner">
                                 @(owner.Display(userConfig.GetText("common_service")))
@@ -191,7 +191,10 @@
     {
         await RefreshTemplates();
         recertOwnerList = await apiConnection.SendQueryAsync<List<FwoOwner>>(FWO.Api.Client.Queries.OwnerQueries.getOwners);
-        modOwnerList = await ModellingHandlerBase.GetOwnApps(authenticationStateTask, userConfig, apiConnection, DisplayMessageInUi);
+        if(showModellingReports)
+        {
+            modOwnerList = await ModellingHandlerBase.GetOwnApps(authenticationStateTask, userConfig, apiConnection, DisplayMessageInUi);
+        }
     }
 
     public async Task RefreshTemplates()