Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace API integer API choice values with slugs #3732

Merged
merged 48 commits into from
Dec 5, 2019
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a2a6b75
Introduce ChoiceSet class for field choices
jeremystretch Nov 7, 2019
e09ad69
Circuit.status (#3569)
jeremystretch Nov 7, 2019
62b4549
Convert all DCIM choice classes to ChoiceSets
jeremystretch Nov 16, 2019
8d27b62
Rack.status to slug (#3569)
jeremystretch Nov 16, 2019
07aa036
Convert RACK_WIDTH_CHOICES to ChoiceSet
jeremystretch Nov 16, 2019
e1e09bf
Correct Rack.type migration logic
jeremystretch Nov 16, 2019
c79c29e
Rack.status to slug (#3569)
jeremystretch Nov 16, 2019
a8db07e
Device.face to slug (#3569)
jeremystretch Nov 17, 2019
88b8cf3
Tweak migrations to handle NULL values
jeremystretch Nov 19, 2019
4f0d82a
Standardize migration names for #3569
jeremystretch Nov 19, 2019
fbd12e1
Create a separate migration for each field
jeremystretch Nov 19, 2019
afd82fd
DeviceType.subdevice_role to slug (#3569)
jeremystretch Nov 19, 2019
4e2863e
Move CircuitTermination.term_side choices to a ChoiceSet
jeremystretch Nov 22, 2019
180d3d0
Resolved migration discrepancies when dealing with NULL values
jeremystretch Nov 22, 2019
5f5081f
Interface.type to slug (#3569)
jeremystretch Nov 22, 2019
f93cd17
Consolidate #3569 field migrations by model
jeremystretch Nov 22, 2019
3fa4cea
Interface.mode to slug (#3569)
jeremystretch Nov 22, 2019
5c95927
Site.status to slug (#3569)
jeremystretch Nov 22, 2019
bcc34f6
Device.face to slug (#3569)
jeremystretch Nov 26, 2019
dead5b4
Front/RearPort.type to slug (#3569)
jeremystretch Nov 26, 2019
79a40e2
Cable.type to slug (#3569)
jeremystretch Nov 26, 2019
4846557
Cable.length_unit to slug (#3569)
jeremystretch Nov 26, 2019
9872a46
Rack.outer_unit to slug (#3569)
jeremystretch Nov 26, 2019
62494f2
PowerFeed.type to slug (#3569)
jeremystretch Nov 26, 2019
bb8b012
PowerFeed.supply to slug (#3569)
jeremystretch Nov 26, 2019
2dc07ca
PowerFeed.phase to slug (#3569)
jeremystretch Nov 26, 2019
8c7f6c6
PowerFeed.status to slug (#3569)
jeremystretch Nov 26, 2019
21fe590
PowerOutlet.feed_leg to slug (#3569)
jeremystretch Nov 28, 2019
929c064
Prefix.status to slug (#3569)
jeremystretch Nov 28, 2019
ba8f324
IPAddress.status to slug (#3569)
jeremystretch Nov 28, 2019
14a7a33
IPAddress.role to slug (#3569)
jeremystretch Nov 28, 2019
213bd15
VLAN.status to slug (#3569)
jeremystretch Nov 28, 2019
4ecbfc4
Service.protocol to slug (#3569)
jeremystretch Nov 28, 2019
ca11b9a
VirtualMachine.status to slug
jeremystretch Dec 5, 2019
3ff22be
CustomField.type to slug
jeremystretch Dec 5, 2019
bfea77b
CustomField.filter_logic to slug
jeremystretch Dec 5, 2019
7a3c725
Convert BUTTON_CLASS_CHOICES to a ChoiceSet
jeremystretch Dec 5, 2019
4e1ee27
Extend CustomField migration to update CustomFieldChoice.field.limit_…
jeremystretch Dec 5, 2019
8efde81
Fix PowerFeed field defaults
jeremystretch Dec 5, 2019
2bcbcd3
ObjectChange.action to slug (#3569)
jeremystretch Dec 5, 2019
a2b0da2
Fix changelog table action labels
jeremystretch Dec 5, 2019
33890e6
Remain consistent with original action strings (e.g. 'created' instea…
jeremystretch Dec 5, 2019
2583823
Delete obsolete user action types
jeremystretch Dec 5, 2019
89e720c
ExportTemplate.template_language to slug (#3569)
jeremystretch Dec 5, 2019
5d772d7
Webhook.http_content_type to slug (#3569)
jeremystretch Dec 5, 2019
edbf562
Annotate all migration operation lists
jeremystretch Dec 5, 2019
17898a4
Merge branch 'develop-2.7' into 3569-api-choice-slugs
jeremystretch Dec 5, 2019
b0c0adf
Adapt device component import forms from #3711
jeremystretch Dec 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix changelog table action labels
jeremystretch committed Dec 5, 2019

Verified

This commit was signed with the committer’s verified signature. The key has expired.
universalmind303 Cory Grinstead
commit a2b0da260877313621a2e0f06c552f0233204eab
6 changes: 3 additions & 3 deletions netbox/extras/tables.py
Original file line number Diff line number Diff line change
@@ -38,11 +38,11 @@
"""

OBJECTCHANGE_ACTION = """
{% if record.action == 1 %}
{% if record.action == 'create' %}
<span class="label label-success">Created</span>
{% elif record.action == 2 %}
{% elif record.action == 'update' %}
<span class="label label-primary">Updated</span>
{% elif record.action == 3 %}
{% elif record.action == 'delete' %}
<span class="label label-danger">Deleted</span>
{% endif %}
"""