Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector

Fixed weird padlock display in asset listing with encrypted custom fields
snipe · Jun 23, 2020 · b42801f · b42801f
2 parents de4934f + 946129f
commit b42801f
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 72 deletions.
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
@@ -268,8 +268,11 @@ public static function dataTableLayout()
                 "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
diff --git a/public/css/dist/all.css b/public/css/dist/all.css