From 61bf508cea3a5f97fee731e20c7ca2695e7bc0b9 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Mon, 27 Mar 2023 10:01:59 +0200
Subject: [PATCH 1/2] Fixed dropdown color #260

---
 kdb-web/package.json                                 | 2 +-
 kdb-web/src/assets/config.json                       | 2 +-
 kdb-web/src/styles/themes/default-dark-theme.scss    | 4 ++++
 kdb-web/src/styles/themes/default-light-theme.scss   | 4 ++++
 kdb-web/src/styles/themes/sh-edraft-dark-theme.scss  | 4 ++++
 kdb-web/src/styles/themes/sh-edraft-light-theme.scss | 4 ++++
 6 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/kdb-web/package.json b/kdb-web/package.json
index e9366174..fc35367e 100644
--- a/kdb-web/package.json
+++ b/kdb-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "kdb-web",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "scripts": {
         "ng": "ng",
         "update-version": "ts-node-esm update-version.ts",
diff --git a/kdb-web/src/assets/config.json b/kdb-web/src/assets/config.json
index d03fbe65..8a14a2f0 100644
--- a/kdb-web/src/assets/config.json
+++ b/kdb-web/src/assets/config.json
@@ -4,7 +4,7 @@
     "ImprintURL": "https://www.sh-edraft.de/Impressum",
     "WebVersion": {
         "Major": "1",
-        "Minor": "0",
+        "Minor": "1",
         "Micro": "0"
     },
     "Themes": [
diff --git a/kdb-web/src/styles/themes/default-dark-theme.scss b/kdb-web/src/styles/themes/default-dark-theme.scss
index 2e6cac2c..5222645f 100644
--- a/kdb-web/src/styles/themes/default-dark-theme.scss
+++ b/kdb-web/src/styles/themes/default-dark-theme.scss
@@ -353,6 +353,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $secondaryBackgroundColor !important;
 
diff --git a/kdb-web/src/styles/themes/default-light-theme.scss b/kdb-web/src/styles/themes/default-light-theme.scss
index b8cd5b06..1e7078e2 100644
--- a/kdb-web/src/styles/themes/default-light-theme.scss
+++ b/kdb-web/src/styles/themes/default-light-theme.scss
@@ -353,6 +353,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $primaryBackgroundColor !important;
 
diff --git a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
index a116773e..42e926ff 100644
--- a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
+++ b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
@@ -357,6 +357,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $secondaryBackgroundColor !important;
 
diff --git a/kdb-web/src/styles/themes/sh-edraft-light-theme.scss b/kdb-web/src/styles/themes/sh-edraft-light-theme.scss
index ab335ab3..8fa8f2fb 100644
--- a/kdb-web/src/styles/themes/sh-edraft-light-theme.scss
+++ b/kdb-web/src/styles/themes/sh-edraft-light-theme.scss
@@ -353,6 +353,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $primaryBackgroundColor !important;
 

From 3bca3f86eb2044b59afb2680c1f280d1b2ae8623 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Mon, 27 Mar 2023 19:33:22 +0200
Subject: [PATCH 2/2] Disabled add button for mods in level list #264

---
 kdb-web/package.json                                          | 2 +-
 .../auto-roles-rules/auto-roles-rules.component.html          | 2 +-
 .../auto-role/components/auto-roles/auto-roles.component.html | 2 +-
 .../server/levels/components/levels/levels.component.html     | 4 ++--
 .../app/modules/view/server/members/members.component.html    | 2 +-
 kdb-web/src/assets/config.json                                | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kdb-web/package.json b/kdb-web/package.json
index e9366174..fc35367e 100644
--- a/kdb-web/package.json
+++ b/kdb-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "kdb-web",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "scripts": {
         "ng": "ng",
         "update-version": "ts-node-esm update-version.ts",
diff --git a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html
index 60c0d0eb..3c389ab5 100644
--- a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html
+++ b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html
@@ -160,7 +160,7 @@
 
           <td>
             <div class="btn-wrapper">
-              <app-history-btn [history]="autoRoleRule.history" translationKey="view.server.auto_roles.rules.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="autoRoleRule.history" translationKey="view.server.auto_roles.rules.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil" (click)="onRowEditInit(dt, autoRoleRule, ri)"></button>
               <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
                       (click)="deleteAutoRoleRule(autoRoleRule)"></button>
diff --git a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html
index f6695fca..a2677dc0 100644
--- a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html
+++ b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html
@@ -193,7 +193,7 @@
             <div class="btn-wrapper">
 <!--              <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"-->
 <!--                      (click)="onRowEditInit(dt, autoRole, ri)"></button>-->
-              <app-history-btn [history]="autoRole.history" translationKey="view.server.auto_roles.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="autoRole.history" translationKey="view.server.auto_roles.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-sliders-h" [routerLink]="[autoRole.id, 'rules']"></button>
               <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
                       (click)="deleteAutoRole(autoRole)"></button>
diff --git a/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html b/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html
index 83f32aa3..97be32d8 100644
--- a/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html
+++ b/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html
@@ -18,7 +18,7 @@
 
           <div class="table-caption-btn-wrapper btn-wrapper">
             <button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
-                    icon="pi pi-user-plus" (click)="addLevel(dt)" [disabled]="isEditingNew">
+                    icon="pi pi-user-plus" (click)="addLevel(dt)" [disabled]="isEditingNew || user?.isModerator && !user?.isAdmin">
             </button>
             <button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
                     class="icon-btn btn" (click)="resetFilters()">
@@ -184,7 +184,7 @@
           </td>
           <td>
             <div class="btn-wrapper">
-              <app-history-btn [history]="level.history" translationKey="view.server.levels.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="level.history" translationKey="view.server.levels.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
                       (click)="onRowEditInit(dt, level, ri)" [disabled]="!user || user.isModerator && !user.isAdmin"></button>
               <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
diff --git a/kdb-web/src/app/modules/view/server/members/members.component.html b/kdb-web/src/app/modules/view/server/members/members.component.html
index 85e1f0f7..8381fc69 100644
--- a/kdb-web/src/app/modules/view/server/members/members.component.html
+++ b/kdb-web/src/app/modules/view/server/members/members.component.html
@@ -224,7 +224,7 @@
           </td>
           <td>
             <div class="btn-wrapper">
-              <app-history-btn [history]="member.history" translationKey="view.server.members.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="member.history" translationKey="view.server.members.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
                       (click)="onRowEditInit(dt, member, ri)"></button>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-user"
diff --git a/kdb-web/src/assets/config.json b/kdb-web/src/assets/config.json
index d03fbe65..8a14a2f0 100644
--- a/kdb-web/src/assets/config.json
+++ b/kdb-web/src/assets/config.json
@@ -4,7 +4,7 @@
     "ImprintURL": "https://www.sh-edraft.de/Impressum",
     "WebVersion": {
         "Major": "1",
-        "Minor": "0",
+        "Minor": "1",
         "Micro": "0"
     },
     "Themes": [