From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 20 May 2022 13:49:10 +0000 (+0200)
Subject: Merge branch '5.5' into search-by-author
X-Git-Tag: 5.5.0_Beta_3~4^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=220d527fc8c4cd7287d4c2df9748aec412d35053;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.5' into search-by-author
---

220d527fc8c4cd7287d4c2df9748aec412d35053
diff --cc ts/WoltLabSuite/Core/Ui/Search/Extended.ts
index 640de5ec46,b4afc7102c..1ad2ebf0c8
--- a/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
+++ b/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
@@@ -195,25 -194,11 +195,28 @@@ export class UiSearchExtended 
            });
            if (id) {
              DatePicker.setDate(id, new Date(value));
+             return;
            }
+ 
+           element.value = value;
          } else if (element instanceof HTMLInputElement) {
 +          if (element.classList.contains("itemListInputShadow")) {
 +            const itemList = element.nextElementSibling as HTMLElement;
 +            if (itemList?.classList.contains("inputItemList")) {
 +              setItemListValues(
 +                itemList.dataset.elementId!,
 +                value.split(",").map((value) => {
 +                  return {
 +                    objectId: 0,
 +                    value: value.trim(),
 +                  };
 +                }),
 +              );
 +            }
 +
 +            return;
 +          }
 +
            if (element.type === "checkbox") {
              element.checked = true;
            } else {
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
index fe4b2af6f9,32a99dfd7d..cb74492d48
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
@@@ -149,21 -149,11 +149,23 @@@ define(["require", "exports", "tslib", 
                          });
                          if (id) {
                              Picker_1.default.setDate(id, new Date(value));
+                             return;
                          }
+                         element.value = value;
                      }
                      else if (element instanceof HTMLInputElement) {
 +                        if (element.classList.contains("itemListInputShadow")) {
 +                            const itemList = element.nextElementSibling;
 +                            if (itemList === null || itemList === void 0 ? void 0 : itemList.classList.contains("inputItemList")) {
 +                                (0, ItemList_1.setValues)(itemList.dataset.elementId, value.split(",").map((value) => {
 +                                    return {
 +                                        objectId: 0,
 +                                        value: value.trim(),
 +                                    };
 +                                }));
 +                            }
 +                            return;
 +                        }
                          if (element.type === "checkbox") {
                              element.checked = true;
                          }
diff --cc wcfsetup/install/lang/de.xml
index 27471990f1,0e2b2a9032..945fe257aa
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -5617,6 -5620,6 +5619,7 @@@ Benachrichtigungen auf <a href="{link i
  	<item name="wcf.user.profile.customization" />
  	<item name="wcf.acp.option.enable_desktop_notifications"/>
  	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
 +	<item name="wcf.search.matchExactly" />
+ 	<item name="wcf.search.subjectOnly" />
  </delete>
  </language>
diff --cc wcfsetup/install/lang/en.xml
index bea06f9691,8f76d2c0e7..802a971915
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -5619,6 -5622,6 +5621,7 @@@ your notifications on <a href="{link is
  	<item name="wcf.user.profile.customization" />
  	<item name="wcf.acp.option.enable_desktop_notifications"/>
  	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
 +	<item name="wcf.search.matchExactly" />
+ 	<item name="wcf.search.subjectOnly" />
  </delete>
  </language>