Przeglądaj źródła

Use display field for all API-backed select options

checktheroads 4 lat temu
rodzic
commit
5e1156abe2

Plik diff jest za duży
+ 0 - 0
netbox/project-static/dist/netbox.js


Plik diff jest za duży
+ 0 - 0
netbox/project-static/dist/netbox.js.map


+ 1 - 24
netbox/project-static/src/select/api.ts

@@ -314,7 +314,7 @@ class APISelect {
     const options = [PLACEHOLDER] as Option[];
     const options = [PLACEHOLDER] as Option[];
 
 
     for (const result of results) {
     for (const result of results) {
-      const text = this.getDisplayName(result);
+      const text = result.display;
       const data = {} as Record<string, string>;
       const data = {} as Record<string, string>;
       const value = result.id.toString();
       const value = result.id.toString();
       let style, selected, disabled;
       let style, selected, disabled;
@@ -514,29 +514,6 @@ class APISelect {
     return placeholder;
     return placeholder;
   }
   }
 
 
-  /**
-   * Find this element's display name.
-   */
-  private getDisplayName(result: APIObjectBase): string {
-    let displayName = result.display;
-
-    const legacyDisplayProperty = this.base.getAttribute('display-field');
-
-    if (
-      typeof displayName === 'undefined' &&
-      legacyDisplayProperty !== null &&
-      legacyDisplayProperty in result
-    ) {
-      displayName = result[legacyDisplayProperty] as string;
-    }
-
-    if (!displayName && typeof result.name === 'string') {
-      displayName = result.name;
-    }
-
-    return displayName;
-  }
-
   /**
   /**
    * Get this element's disabled options by value. The `data-query-param-exclude` attribute will
    * Get this element's disabled options by value. The `data-query-param-exclude` attribute will
    * contain a stringified JSON array of option values.
    * contain a stringified JSON array of option values.

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików