Merge branch '5.5' into search-by-author
authorAlexander Ebert <ebert@woltlab.com>
Fri, 20 May 2022 13:49:10 +0000 (15:49 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 20 May 2022 13:49:10 +0000 (15:49 +0200)
1  2 
com.woltlab.wcf/templates/search.tpl
ts/WoltLabSuite/Core/Ui/Search/Extended.ts
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

Simple merge
index 640de5ec465a21e2990c8f45f534a182ae825359,b4afc7102cad39468a50debdaffdc9febf1762c2..1ad2ebf0c829d17ce38d21d13a360975aac67551
@@@ -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 {
index fe4b2af6f9e6f5c94f5ce6583f41fcd84292ef51,32a99dfd7d264c089a5aef4a4a9408b1a1fbc1e0..cb74492d48086b199da5f8d42b34267b03f727be
@@@ -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;
                          }
index 27471990f129f09fac35bad8da1c136c330a1d2e,0e2b2a903243aec3885257687e26efd5b856f1ba..945fe257aac6f2a9de3fcce4d1bb8036d04e4a27
@@@ -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>
index bea06f9691fedc2e8cb42e422b8f54e1e433531e,8f76d2c0e779fa79b4bb8b06cbb59ab73eb8cf55..802a9719156b43d255938811415640c9b6a0c366
@@@ -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>