From d1aa11ec89347fb2c139d751719c4459c2448321 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 22 Jun 2020 20:29:19 -0700
Subject: [PATCH] Fix for weird padlock display in asset listing with encrypted
 custom fields

---
 app/Presenters/AssetPresenter.php    |   7 ++-
 public/css/build/all.css             | Bin 248117 -> 248872 bytes
 public/css/dist/all.css              | Bin 240238 -> 240993 bytes
 public/css/overrides.css             | Bin 6726 -> 7481 bytes
 public/css/overrides.css.map         | Bin 11037 -> 12592 bytes
 public/js/build/vue.js.map           | Bin 2832412 -> 2832412 bytes
 public/mix-manifest.json             |  10 ++--
 resources/assets/less/overrides.less |  69 +++++++++++++++++++++++++++
 8 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 4b791be0c1..b8fc9c901d 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -268,8 +268,11 @@ class AssetPresenter extends Presenter
                 "searchable" => true,
                 "sortable" => true,
                 "switchable" => true,
-                "title" => ($field->field_encrypted=='1') ?'<i class="fa fa-lock"></i> '.$field->name : $field->name,
-                "formatter" => "customFieldsFormatter"
+                "title" => $field->name,
+                'formatter' => 'customFieldsFormatter',
+                'escape' => true,
+                'class' => ($field->field_encrypted=='1') ? 'css-padlock' : '',
+                'visible' => true,
             ];
 
         }
diff --git a/public/css/build/all.css b/public/css/build/all.css
index a56df622ffb651a59a28cd5cf28364a22ba1366a..0852d2469d9dea691357480cd04ce653f916c5a9 100644
GIT binary patch
delta 529
zcmdlwiGRfm{)QID7N#xCJSXc*GW3#*i**x|lT(X}^NT9&^hz>xGxPFNi*%q;Nr^?t
z`6;QG63O{_#ihB4NjX^Lax#-s^NNuqs?+lGN_2}et5U5DtaCE+Qgt&@Gt)DeO01^e
zcVH4{&Ph$1{__=6G#&?8C8eh27p3BK7n(da=b<UVaHUm}DvBKii77ex$=L|MLk*Zd
zaVw+f^xdzREF_E!3My)$L4~Y*`o&;oacwsPBV#3Npm<7VUb=1((8ncKMhFeaVGGtE
z3Dn@I1TzoWePC%BHv?yLxHOs%!78NP3`~sSDo~>ptbo<c(9l_Fy5L%7@##t@nS}vx
C3%+*%

delta 25
hcmZ26gMaHJ{)QID7N#xCJSV3Mtz{OQE_#Mp7yx~Q2)Y0O

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 4e056eb7e41eeab7d80d539439b28d9a1f19705e..a1f66bd8696e77f4b5043217787e9afc04cbe835 100644
GIT binary patch
delta 547
zcmaENh40}lzJ?aY7N#xCxvT0+GW3#*i**x|lT(X}^NT9&^hz>xGxPFNi*%q;Nr^?t
z`6;QG63O{_#ihB4NjX^Lax#-s^NNuqs?+lGN_2}et5U5DtaCE+Qgt&@Gt)C<N~}y2
zGjj{_i%JsnN~}v#D@t?|b28KOta4J*rk6iripJwYtEAMl{GwEx4n>p4=3X=<7|ymz
zQbn<&ATcE;KRFu_7*GQyJFXO)ZuN-CT-wN>prRHUbZDw4JF1E3xfvK4D_H|&QZn<>
zb&G&uP-10-(1I4)AT2ULEsjbsGtry~QXubU;A{?8fay(;8aX!u6Jxj<jOYd_VRth$
JbXKb60swS7#Vr5;

delta 17
YcmaEOi|^ePzJ?aY7N#xCxvLnt08GdR{r~^~

diff --git a/public/css/overrides.css b/public/css/overrides.css
index 0c23ba211b27c92f91077e22a585fe0bea2b9a84..50c9619ae81e13e2e400a2552837974bf55f403b 100644
GIT binary patch
delta 755
zcmZ`%%WA_g5WM%)OD~}<iI1g9<HS&qp%7B?6}`yv#ukw!BW;M2Q2Y`3kzV@){jMqx
z=VkjO#LUj_%<f<COMjj^C8m9DEn%F4wc4yc`j`@-6qwf|6fwhf40V8OWfvKXWCJDz
z2W2mS%}gsKR;+;zLMarG6hxAiNQ0ipa&3?)3=s+>Oo~KN3A5whfQrEgl~A@o9g-zP
zbAjX_m}!ma9#be>C9@ERB-3l6ZE?#<3|m>wBz#x4%erqG!Au)ywSR**rEo*3g>lB8
z_vz;>mYUDc5g!Sg?fu<Dxid<YHW`!M>&FlB;?3_)9bvo#t1}4CF%JiMQTc3b;HF1#
z^4`~UFdTWIBgQUGV%%<!4tEOW;X-O>P|bKHG4`sKZKgMu{K@-?-<sp6fvcKebgF5%
O+J>oof8uQ)J1_qR(-zwR

delta 11
ScmdmKb<AXgtkh%ySxo>Nw*$Ta

diff --git a/public/css/overrides.css.map b/public/css/overrides.css.map
index 8f69f597f48e5e69fb2ffe3108125b3238709457..bfec6b1f14327caee8c5227e26036df3988294d5 100644
GIT binary patch
delta 1523
zcmah}O>fgc5It6K=K`0ZTu@}kO{pkNB_zjkLe-B{q~%M#Y@A8FioKicZknVO%8%$3
z{zE1H3%`f)rmaI`ie;_k*_k)*y;=L`r<?B0cw^yY4PQ2z&b;LxhR#<%@SSNRUk7%T
zcFlr3G7S8KrZYbD+o3bI@wYaPeyiyW0zV9Ii-wINg1+Bz0>Aa;Hluha&@g=F6am5~
zi2VK6c;nlvMI^jRB@&T<pnY_Hd;*>DC=AZpAK@TqpL8hhK6cUmS;95YJ>;SXvJX?_
zs^>s=Vt~`FL12tpGc^YzVWjW^g#nWw#4=q>GT~}WF*Z_Bpoh>`GJ`HteJ%zLXf9%;
zE=<hf!`bl>Of>d@3kz_rQJpH(1c(ZvO~Xx!(Izls6ej`*U4?9@@48VlxNnxDRY^aA
z9|&!b5$P%B_z-kDIak)}*-9QuK`kkgvo@@oA|#ZLiYgKwCy*k$z|uB^UhpzFGr+XV
zb=CIm;DV5h8R@#`4Y)}r-D)f|PYXW6<?3?dajhq)z1_Wcd$z3N<qwloW363s%G&lG
zswQ!{5X9<!GvzS~5>&cLs&qWbtenyW7UzSLG`N-RNL-O7=u2T-%`dSITcg>29!j}D
zH$gr~OdWP!@@yoPVZvNLee!&fOLr9tGL7b12R1R%R=HE`4!LocfSHsgStba>S;`rW
zdzqKXOIPaITH-*lxsF+il=eM0=3f1X^->uRbM}inZ|e0f_NBtYqY?wxlS+(SPs$Bl
z_tWN8|7uxk>>XY%;5r3x$>BN(sWO&6c+_@AGp`0s%J8SCWrq9LKVH8ek@iTe=zb{s
zc6!9r&_`3Jvl&JGt?f6_rZt%=d*r^WmP6dOleMP)`?M9j7gzZ)c!<p`_A1CDW|s4d
sch@k=yk4Lx$dqx}S?XNn@}E(Zpwwz{!G?aH9()cPr+#n<*S{;RKR4nCi2wiq

delta 16
XcmdmxG&gKRA^T=ljwt2H_Y8snIxz-b

diff --git a/public/js/build/vue.js.map b/public/js/build/vue.js.map
index 66ac592ac854716687a9aeb1f9bbfb5221c152a5..618a7d0316b06cd785ba81b09279d614a9e86050 100644
GIT binary patch
delta 258
zcmZw9KTg767{~DxsaWJKNLx^`3gtforPP#5xR~exOtlVPLWU<Kod`{M7ZNVuN}M<Y
zp5fVm#CQaL><*vhJA4;^U&;cef$0UqC=6dC|Lw&ehW8_H<Oj*4aOIC@^^=X}CZ8fV
zW@3dnMSMb>CRT}0i8I7!#2Rsy_?$SmVzJ)-JCw^O=UslNx-s`GTMnKbSMGkr#U$Pf
w&>;^6IJP1fV1flDD8nUO!8KIi25h*6JE%ep9H>JBn$UtabfEhk?|ZX{19N<I1^@s6

delta 258
zcmZw9KTg767{~GOPbl;S6$%Pepdz4yrKwT51B;0sK&meTmw@4kNhe|x-i3q<xDqDM
z0B3kMY(hK&KX!)C@*TeO|DVVlrjG^rE}!JUb9;{GK6uaa^TU<Fi?G$kG46x4W(Q-T
zPnbAD93_qs$B7ffC&WqO6tPB}Ce9G+OBTP|qeHcLwT5bx$mVB`VXE$%WvjoPIQ#NL
x0a?hwDID54<e>lt6rltca0z9oKov~5f*RDJ0Tx_C6K<ddZRo)5$`9|p`+KTnb)WzM

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 85b9f6a383..28f29c4148 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,7 +2,7 @@
     "/js/build/vue.js": "/js/build/vue.js?id=461ae9803574a5a52d43",
     "/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545",
     "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
-    "/css/overrides.css": "/css/overrides.css?id=014ba62bc420467fd405",
+    "/css/overrides.css": "/css/overrides.css?id=d1fe6296eb548247a5ad",
     "/css/skins/skin-blue.css": "/css/skins/skin-blue.css?id=c28283a1d468e2337428",
     "/css/skins/skin-red.css": "/css/skins/skin-red.css?id=079dd6c501fa9ea60a98",
     "/css/skins/skin-contrast.css": "/css/skins/skin-contrast.css?id=62e14190151e9efc9995",
@@ -18,10 +18,10 @@
     "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4",
     "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860",
     "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=edafd9b8d5c4f4218518",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=b1638dbc458713cd9c38",
     "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2",
     "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
-    "/css/overrides.css.map": "/css/overrides.css.map?id=fe0a3186bd85efc442ca",
+    "/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b",
     "/css/skins/skin-blue.css.map": "/css/skins/skin-blue.css.map?id=129b9523e6ffd5683230",
     "/css/skins/skin-red.css.map": "/css/skins/skin-red.css.map?id=292dfa49bf2b6f23fa59",
     "/css/skins/skin-contrast.css.map": "/css/skins/skin-contrast.css.map?id=bf37f812f0b6a109b5ce",
@@ -37,8 +37,8 @@
     "/css/skins/skin-blue-dark.css.map": "/css/skins/skin-blue-dark.css.map?id=32784cb5d02773eb0e69",
     "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29",
     "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e",
-    "/css/dist/all.css": "/css/dist/all.css?id=32f6e6a70fdaa03a0d88",
+    "/css/dist/all.css": "/css/dist/all.css?id=0491555899142b86167d",
     "/js/dist/all.js": "/js/dist/all.js?id=bf5cd2065e997d7692e0",
-    "/css/build/all.css": "/css/build/all.css?id=32f6e6a70fdaa03a0d88",
+    "/css/build/all.css": "/css/build/all.css?id=0491555899142b86167d",
     "/js/build/all.js": "/js/build/all.js?id=bf5cd2065e997d7692e0"
 }
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 3a68c0d96f..e6130e2360 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -465,3 +465,72 @@ h4 {
   border-top: 1px solid #dddddd;
   display: table-cell;
 }
+
+
+
+
+/**
+
+ COLUMN SELECTOR ICONS
+ -----------------------------
+ This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since
+ any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
+
+ Instead, we use CSS to add the icon into the table header, which leaves the column selector
+ "title" text as-is.
+
+ See https://github.com/snipe/snipe-it/issues/7989
+
+ */
+
+th.css-barcode > .th-inner,
+th.css-license > .th-inner,
+th.css-consumable > .th-inner,
+th.css-accessory > .th-inner
+{
+  font-size: 0px;
+  line-height: 4!important;
+  text-align: left;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+
+th.css-padlock > .th-inner::before,
+th.css-barcode > .th-inner::before,
+th.css-license > .th-inner::before,
+th.css-consumable > .th-inner::before,
+th.css-accessory > .th-inner::before
+
+{
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: 20px;
+}
+
+th.css-padlock > .th-inner::before
+{
+  content: "\f023";
+  padding-right: 2px;
+}
+
+th.css-barcode > .th-inner::before
+{
+  content: "\f02a";
+}
+
+th.css-license > .th-inner::before
+{
+  content: "\f0c7";
+}
+
+th.css-consumable > .th-inner::before
+{
+  content: "\f043";
+}
+
+th.css-accessory > .th-inner::before
+{
+  content: "\f11c";
+}
\ No newline at end of file