From 8f88d2afab97cb41fd25f22aad2e500d99aa3638 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 20 Aug 2020 15:44:30 -0400
Subject: [PATCH] Closes #5024: List available options for choice fields within
 CSV import forms

---
 docs/release-notes/version-2.9.md              |  4 ++++
 .../templates/utilities/obj_bulk_import.html   | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 2b06d0582..8dd45b1f8 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -2,6 +2,10 @@
 
 ## v2.9-beta3 (FUTURE)
 
+### Enhancements
+
+* [#5024](https://github.com/netbox-community/netbox/issues/5024) - List available options for choice fields within CSV import forms
+
 ### Bug Fixes
 
 * [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution
diff --git a/netbox/templates/utilities/obj_bulk_import.html b/netbox/templates/utilities/obj_bulk_import.html
index 4359d49a6..9d63788ba 100644
--- a/netbox/templates/utilities/obj_bulk_import.html
+++ b/netbox/templates/utilities/obj_bulk_import.html
@@ -66,6 +66,24 @@
                                             {% endif %}
                                         </td>
                                         <td>
+                                            {% if field.choice_values %}
+                                                <button type="button" class="btn btn-primary btn-xs pull-right" data-toggle="modal" data-target="#{{ name }}_choices">
+                                                    <i class="fa fa-question"></i>
+                                                </button>
+                                                <div class="modal fade" id="{{ name }}_choices" tabindex="-1" role="dialog">
+                                                    <div class="modal-dialog" role="document">
+                                                        <div class="modal-content">
+                                                            <div class="modal-header">
+                                                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                                                <h4 class="modal-title"><code>{{ name }}</code> Choices</h4>
+                                                            </div>
+                                                            <div class="modal-body">
+                                                                <ul>{% for value, label in field.choices %}{% if value %}<li>{{ value }}</li>{% endif %}{% endfor %}</ul>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            {% endif %}
                                             {% if field.help_text %}
                                                 {{ field.help_text }}<br />
                                             {% elif field.label %}