mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

fix object journal styles

Browse Source
This commit is contained in:
checktheroads
2021-03-17 22:37:13 -07:00
parent 8ea2949d84
commit cf8dad5763
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/forms.py
View File

@ -377,6 +377,12 @@ class ImageAttachmentForm(BootstrapMixin, forms.ModelForm):
class JournalEntryForm(BootstrapMixin, forms.ModelForm): class JournalEntryForm(BootstrapMixin, forms.ModelForm):
kind = forms.ChoiceField(
choices=add_blank_choice(JournalEntryKindChoices),
required=False,
widget=StaticSelect2()
)
class Meta: class Meta:
model = JournalEntry model = JournalEntry
fields = ['assigned_object_type', 'assigned_object_id', 'kind', 'comments'] fields = ['assigned_object_type', 'assigned_object_id', 'kind', 'comments']

32
netbox/templates/extras/object_journal.html
View File

@ -3,30 +3,30 @@
{% block title %}{{ block.super }} - Journal{% endblock %} {% block title %}{{ block.super }} - Journal{% endblock %}
{% render_errors form %}
{% block content %} {% block content %}
{% if perms.extras.add_journalentry %} {% if perms.extras.add_journalentry %}
<div class="panel panel-default"> <div class="col-md-9 col-md-offset-3">
<div class="panel-heading"> <div class="field-group">
<strong>New Journal Entry</strong> <h4>New Journal Entry</h4>
</div> <form action="{% url 'extras:journalentry_add' %}" method="post" enctype="multipart/form-data">
<form action="{% url 'extras:journalentry_add' %}" method="post" enctype="multipart/form-data" class="form form-horizontal">
{% csrf_token %} {% csrf_token %}
{% for field in form.hidden_fields %} {% for field in form.hidden_fields %}
{{ field }} {{ field }}
{% endfor %} {% endfor %}
<div class="row panel-body"> {% render_field form.kind %}
<div class="col-md-10"> {% render_field form.comments %}
{% render_field form.kind %}
{% render_field form.comments %}
</div>
<div class="col-md-9 col-md-offset-3">
<button type="submit" class="btn btn-primary">Save</button>
<a href="{{ object.get_absolute_url }}" class="btn btn-default">Cancel</a>
</div>
</div>
</form> </form>
</div> </div>
<div class="col-md-12 col-md-offset-3 text-end my-3">
<a href="{{ object.get_absolute_url }}" class="btn btn-outline-danger">Cancel</a>
<button type="submit" class="btn btn-primary">Save</button>
</div>
</div>
{% endif %} {% endif %}
{% include 'panel_table.html' %} <div class="col-md-9 col-md-offset-3 mb-3">
{% include 'panel_table.html' %}
</div>
{% include 'inc/paginator.html' with paginator=table.paginator page=table.page %} {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
{% endblock %} {% endblock %}