Fix search for category in motion edit (#2817)

OpenSlides · Sep 21, 2023 · 412525f · 412525f
1 parent 64c0ce7
commit 412525f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/client/src/app/infrastructure/definitions/tree.ts b/client/src/app/infrastructure/definitions/tree.ts
@@ -21,6 +21,7 @@ export interface TreeNodeWithoutItem extends TreeIdNode {
 export interface OSTreeNode<T> extends TreeNodeWithoutItem {
     item: T;
     children?: OSTreeNode<T>[];
+    toString: () => string;
 }
 
 /**
@@ -46,6 +47,7 @@ export type FlatNode<T> = T & {
     expandable: boolean;
     id: number;
     filtered?: boolean;
+    toString: () => string;
 };
 
 function isIdentifiedItemNode(obj: any): boolean {

diff --git a/...pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html b/...pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html
@@ -182,6 +182,7 @@
                 formControlName="category_id"
                 placeholder="{{ 'Category' | translate }}"
                 [repo]="categoryRepo"
+                [excludeIds]="true"
             ></os-repo-search-selector>
         </mat-form-field>
     </div>

diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts
@@ -31,7 +31,10 @@ export class TreeService {
             name: item.getTitle(),
             id: item.id,
             item,
-            children
+            children,
+            toString: function () {
+                return this.item.toString();
+            }
         };
     }
 
@@ -352,7 +355,10 @@ export class TreeService {
             isSeen: true,
             expandable: false,
             id: item.id,
-            position: index + oldMaxPosition + 1
+            position: index + oldMaxPosition + 1,
+            toString: function () {
+                return this.item.toString();
+            }
         }));
         return tree.concat(items);
     }
@@ -406,7 +412,10 @@ export class TreeService {
             expandable: !!children,
             isExpanded: !!children,
             level,
-            isSeen: true
+            isSeen: true,
+            toString: function () {
+                return this.item.toString();
+            }
         };
         return new Proxy(node, {
             get: (target: FlatNode<T>, property: keyof Identifiable & Displayable & T) => {