From 5e1156abe26ae9ec5ab0ad7ba38f5dd7457899be Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Tue, 20 Jul 2021 14:17:12 -0700
Subject: [PATCH] Use display field for all API-backed select options

---
 netbox/project-static/dist/netbox.js     | Bin 695102 -> 694902 bytes
 netbox/project-static/dist/netbox.js.map | Bin 1641998 -> 1641210 bytes
 netbox/project-static/src/select/api.ts  |  25 +----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 7b305f531dd8f458143d2fcf9fca2e4c2984bc2f..ad52ff9ac1a891fe916510b33509edcc23355c86 100644
GIT binary patch
delta 53
zcmdnDP3zkht%erH7N!>F7M2#)7Pc1l7LF~PtW2EAdMTO31v!b8+ohQ}6}a2K@p5ke
J#>?f=3jp>p5x)Qc

delta 218
zcmeyiMQh(St%erH7N!>F7M2#)7Pc1l7LF~PtW07h8JWd;>8T|ynZ*S;iIskdxv3h-
zn%nu9I2E`#U?S7GSvh6uQy@xoifqA}k`jwkK{_2vN{TX*N=s5Tl%Ohf(=t<YQj|2U
zi&9HUi}Do8@-tHu3~X&}OVrfzN^^1)ZEcIx)QS``^Au9m)HF(LQ=^MwHFZjAYLtqB
qX62<TDcY7)7Nq8<DWvM<0bNv6160HbVFT5*%ky$>m*?dQ?*#yTjYw($

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index ef3c1cce5bc99772c9d90612a76ed4cc97536210..0061aa724bbcf4ba2979bfefbad244b2578a8c1c 100644
GIT binary patch
delta 662
zcmY+=O=uHQ5C?Gf?Y^C4Yd-95QcKasfFK%8Ta(7N2YDNF5c*--1feI>Bx;((G)dDm
zeo-M%@E}IeDJW<`FM@(nTs?U4ELia%9=wPm1w{gWfGy(N+j{uT;r*Fm=3Tv=`Ew()
z)D)VeDK@1hU6Tje;$T_F)CUq&(u}b{j72Is-rXQx9FGWYT=Ij0rCSok*WU@n^|0v1
zXKmR>>J?o5N+Rg{O&!?xQ&!OTOQ!gDRFv^z-gf2bb^2B?uKkdQft)Mjt4;ZylAqH@
z11H#QUdQtnY`ct=Ex92<{<OZJ2PW|GZldC&OEyJHvO}kESb!($K(?X>qUK`9%#vl5
z>`ekY)l&AX^*zakGT2Apy;{pG#4HU{ESNTfJ;+3OsMXU$M=fbdXTceRNKh5X{u!)O
z*h|7GW0k^+Ktd^e<A4yB0D4Gx8u@D%?nA2KI=}(5bmPf+f#MN~Qp`2!h@sn{MeH%g
zCIWF5%@`jQ_(n)*+8i`U`jcpPLQO3u|GO#8`V-i4LR76MCN0Yqbyi5=7biT>%2Q{e
zmL$j5o;2>eV3TN#_@Xs3FFJ0lb;5H&YfJ>Kf5hhn$MLcTTiW5VS!)xYR~f^W2ksaf
zUI=xN#o}_WA2=Il=M=7k+r~LKC+Fha+;*;$Q#sA(^?P2tbXBs|T4DZRCRd#+q#7gG
aj=MaD<Fn^e&vHcca$VdGBO-RcQ~m+BGsf)z

delta 1331
zcmZuvU1%It6lU&b<|bRSn`UM=i9dLk&~4I;Nvwu#5<<CmyM)jtn>0UFtcA_&>|bYR
zlbuQJ)Q42uA{7x4<P@~Df{*&3*i40r;Ip7bXi*S-=!>98ptfL3@XqcgozM>VyIeTu
z`_4Jvng2e@zW+(~d`+mKTA<ca6Tg-YZU!nAgUoMeD5z0N)f8Q^8C?AnMPVi(bij8p
z9E8fpEh7B*4-(<0kw6Dr-;{_j09XG)hk)D{+hO=$DG21AB*NCQfCM*6t?zDpDE=(C
zAKaD3Fe+H^!vpEFHfNO`Q%}&dhU+|(F128%z|Jr=4PVBP41c`W8Wb0)QD87C;IEX^
zc~)g=((7r;yL38|gDn9+Cm+n2{=g!w=3o%vU*tpjnUs$)Pi@@`?1RGr{Dm@*9X;ZU
zRv5Lj8!gxpkd=is5%(cebFYZ_k|36~1>V+XUqFU5#-qqw1|H~w0~+pu^KT=?cXiwl
zf*Y;)CJG;=^eAtW>gps-zQo*LgZOVGmX~+5es9MFl}>;V!fW#I(ys9|T3UjOA)J&4
z7LWVdEHip;5rpS)9K<lLDK9S+lD=?}PqE-$4&w(%$<Lqlhr9ugyPtRBZv-VjH{`dB
zi`ui`DEOhWnlAZCTyJCsE=KT`_43Tp?m~&_d3D-b#e8$d5^Jm`MXAPr9GX_=Xo~NK
zKi^<#-H!T|p){j%Wo<O6zDi#?U8fb8XH%K)pVAlWZ|YGTFPJ*V)WjpzDLQF*8PrO8
zGL%#6)zUP{&3KeIO(zS?-514)J!r^$=Tr=Hv~sj@1UdF_JjKz@5#k7Qba3qD=;V+&
z6!%mt^6mG}+J&MunAhziMQg>#I5U~D-dEMFHN);7hvB(!#65f`a_1SC-HPCzqD6E=
zFYBhg-y+!tgP5EGf)wpqe_UgX(AlZ<a!J>0ma+8yF=E-(qM0Xeo-_&n4Bg(=@hX!E
z(x^Sy6dylnHWIapY1uqIpV6FVnb~S(MX%ZpC)I~ohPQ;MoM?3QLawMA+5P=H0>vEZ
zYe*4dJ1cr6x4SUVz0scaCl`oKOb~O;Fi1SUE%D^UqS@@fk=DOGCfQx9ne^IYB4KZy
z*Ga}|+61e&IwP^B7j=W;@$K%LM%CTFc{kMkv_EafM=v}MvCE<Eww?XLrw8Qdg<gKT
NF7$R^>+QK6{2$~?rk(%*

diff --git a/netbox/project-static/src/select/api.ts b/netbox/project-static/src/select/api.ts
index 0a3870780..e3bdeda78 100644
--- a/netbox/project-static/src/select/api.ts
+++ b/netbox/project-static/src/select/api.ts
@@ -314,7 +314,7 @@ class APISelect {
     const options = [PLACEHOLDER] as Option[];
 
     for (const result of results) {
-      const text = this.getDisplayName(result);
+      const text = result.display;
       const data = {} as Record<string, string>;
       const value = result.id.toString();
       let style, selected, disabled;
@@ -514,29 +514,6 @@ class APISelect {
     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
    * contain a stringified JSON array of option values.