mirror of
				https://github.com/netbox-community/netbox.git
				synced 2024-05-10 07:54:54 +00:00 
			
		
		
		
	* Initial work on custom field choice sets * Rename choices to extra_choices (prep for #12194) * Remove CustomField.choices * Add & update tests * Clean up table columns * Add order_alphanetically boolean for choice sets * Introduce ArrayColumn for choice lists * Show dependent custom fields on choice set view * Update custom fields documentation * Introduce ArrayWidget for more convenient editing of choices * Incorporate PR feedback * Misc cleanup * Initial work on predefined choices for custom fields * Misc cleanup * Add IATA airport codes * #13241: Add support for custom field choice labels * Restore ArrayColumn * Misc cleanup * Change extra_choices back to a nested ArrayField to preserve choice ordering * Hack to bypass GraphQL API test utility absent support for nested ArrayFields
This commit is contained in:
		@@ -17,6 +17,10 @@
 | 
			
		||||
              <th scope="row">Description</th>
 | 
			
		||||
              <td>{{ object.description|markdown|placeholder }}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
              <th scope="row">Base Choices</th>
 | 
			
		||||
              <td>{{ object.get_base_choices_display|placeholder }}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
              <th scope="row">Choices</th>
 | 
			
		||||
              <td>{{ object.choices|length }}</td>
 | 
			
		||||
@@ -42,12 +46,19 @@
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="col col-md-6">
 | 
			
		||||
      <div class="card">
 | 
			
		||||
        <h5 class="card-header">Choices</h5>
 | 
			
		||||
        <h5 class="card-header">Choices ({{ object.choices|length }})</h5>
 | 
			
		||||
        <div class="card-body">
 | 
			
		||||
          <table class="table table-hover attr-table">
 | 
			
		||||
            {% for choice in object.choices %}
 | 
			
		||||
          <table class="table table-hover table-headings">
 | 
			
		||||
            <thead>
 | 
			
		||||
              <tr>
 | 
			
		||||
                <td>{{ choice }}</td>
 | 
			
		||||
                <th>Value</th>
 | 
			
		||||
                <th>Label</th>
 | 
			
		||||
              </tr>
 | 
			
		||||
            </thead>
 | 
			
		||||
            {% for value, label in object.choices %}
 | 
			
		||||
              <tr>
 | 
			
		||||
                <td>{{ value }}</td>
 | 
			
		||||
                <td>{{ label }}</td>
 | 
			
		||||
              </tr>
 | 
			
		||||
            {% endfor %}
 | 
			
		||||
          </table>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user