Skip to content

fix(templates): badly formatted error notification #573

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.

Sign up for GitHub

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

Open
ELDiablO59152 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(templates): badly formatted error notification #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 28 additions & 19 deletions vulture_os/applications/templates/apps/logfwd_LogOMElasticSearch.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,49 @@
<div class="col-md-12">
<form id="frontend_edit_form" class="form-horizontal bootstrap-validator-form" action="" method="post" novalidate="novalidate">
{% csrf_token %}
<div class="panel">
{% if save_error or form.non_field_errors %}
<div class="panel panel-danger">
<div class="panel-heading">
<h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "Elasticsearch Log forwarder" %}</h1>
{# If there is save/configuration errors #}
{% if save_error %}
<ul class="nav nav-tabs pull-right ui-sortable-handle">
<li class="active"><a href="#tab_1" data-toggle="tab">{% translate "Message" %}</a></li>
<li><a href="#tab_2" data-toggle="tab">{% translate "Advanced informations" %}</a></li>
</ul>
<h4 class="panel-title">{% translate "Configuration error" %}</h4>
{% endif %}
{% if form.non_field_errors %}
<h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors" %} </h4>
{% endif %}
</div>
<div class="panel-body">
{# Print form errors correctly #}
{% if form.non_field_errors %}
<div class="alert alert-danger alert-dismissible">
<h4><i class="icon fa fa-ban"></i> Form errors </h4>
<div class="tab-content no-padding">
{{ form.non_field_errors|safe }}
</div>
<div class="alert alert-danger">
{{ form.non_field_errors|safe }}
</div>
{% endif %}
{# If there is save/configuration errors #}
{% if save_error %}
<div class="alert alert-danger alert-dismissible nav-tabs-custom">
<ul class="nav nav-tabs pull-right ui-sortable-handle">
<li><a href="#tab_2" data-toggle="tab">Advanced informations</a></li>
<li class="active"><a href="#tab_1" data-toggle="tab">Message</a></li>
<li class="pull-left header"><i class="fa fa-inbox"></i>Configuration error</li>
</ul>
<div>
<div class="tab-content no-padding">
<div class="tab-pane active" id="tab_1">
<pre>{{ save_error.0 }}</pre>
</div>
<!-- /.tab-pane -->
<pre class="console-type">{{ save_error.0 }}</pre>
</div> <!-- /.tab-pane -->
<div class="tab-pane" id="tab_2">
<pre>{{ save_error.1 }}</pre>
</div>
<!-- /.tab-pane -->
<pre class="console-type">{{ save_error.1 }}</pre>
</div> <!-- /.tab-pane -->
</div>
</div>
{% endif %}
</div>
</div>
{% endif %}
<div class="panel">
<div class="panel-heading">
<h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "Elasticsearch Log forwarder" %}</h1>
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-12">
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion vulture_os/services/frontend/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def render_form(front, **kwargs):
reputationctx_ids = json_loads(request.POST.get('reputation_contexts', "[]"))
assert isinstance(reputationctx_ids, list), "reputation_contexts field must be a list."
except Exception as e:
return render_form(frontend, save_error=["Error in ReputationConext field : {}".format(e),
return render_form(frontend, save_error=["Error in ReputationContext field : {}".format(e),
str.join('', format_exception(*exc_info()))])

""" For each reputation_context in list """
Expand Down
5 changes: 4 additions & 1 deletion vulture_os/services/templates/services/frontend_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors
<div class="panel-body">
{# Print form errors correctly #}
{% if form.non_field_errors %}
<div>
<div class="alert alert-danger">
{{ form.non_field_errors|safe }}
</div>
{% endif %}
Expand All @@ -56,6 +56,9 @@ <h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors
</div>
{% endif %}
<div class="panel">
<div class="panel-heading">
<h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "Listeners" %}</h1>
</div>
<div class="panel-body">
<div class="nav-tabs-custom nav-tabs-no-margin">
<ul class="nav nav-tabs">
Expand Down
45 changes: 26 additions & 19 deletions vulture_os/system/templates/system/tls_profile_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,47 @@
<div class="col-md-12">
<form id="tls_edit_form" class="form-horizontal bootstrap-validator-form" action="" method="post" novalidate="novalidate">
{% csrf_token %}
<div class="panel">
<div class="panel panel-danger">
<div class="panel-heading">
<h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "TLS Profile" %}</h1>
{# If there is save/configuration errors #}
{% if save_error %}
<ul class="nav nav-tabs pull-right ui-sortable-handle">
<li class="active"><a href="#tab_1" data-toggle="tab">{% translate "Message" %}</a></li>
<li><a href="#tab_2" data-toggle="tab">{% translate "Advanced informations" %}</a></li>
</ul>
<h4 class="panel-title">{% translate "Configuration error" %}</h4>
{% endif %}
{% if form.non_field_errors %}
<h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors" %} </h4>
{% endif %}
</div>
<div class="panel-body">
{# Print form errors correctly #}
{% if form.non_field_errors %}
<div class="alert alert-danger alert-dismissible">
<h4><i class="icon fa fa-ban"></i> {% translate "Form errors" %} </h4>
<div class="tab-content no-padding">
{{ form.non_field_errors|safe }}
</div>
<div class="alert alert-danger">
{{ form.non_field_errors|safe }}
</div>
{% endif %}
{# If there is save/configuration errors #}
{% if save_error %}
<div class="alert alert-danger alert-dismissible nav-tabs-custom">
<ul class="nav nav-tabs pull-right ui-sortable-handle">
<li><a href="#tab_2" data-toggle="tab">{% translate "Advanced informations" %}</a></li>
<li class="active"><a href="#tab_1" data-toggle="tab">{% translate "Message" %}</a></li>
<li class="pull-left header"><i class="fa fa-inbox"></i>{% translate "Configuration error" %}</li>
</ul>
<div>
<div class="tab-content no-padding">
<div class="tab-pane active" id="tab_1">
<pre>{{ save_error.0 }}</pre>
</div>
<!-- /.tab-pane -->
<pre class="console-type">{{ save_error.0 }}</pre>
</div> <!-- /.tab-pane -->
<div class="tab-pane" id="tab_2">
<pre>{{ save_error.1 }}</pre>
</div>
<!-- /.tab-pane -->
<pre class="console-type">{{ save_error.1 }}</pre>
</div> <!-- /.tab-pane -->
</div>
</div>
{% endif %}
</div>
</div>
<div class="panel">
<div class="panel-heading">
<h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "TLS Profile" %}</h1>
</div>
<div class="panel-body">
<div class="nav-tabs-custom nav-tabs-no-margin">
<ul class="nav nav-tabs">
<li class="active"><a href="#tab_general" data-toggle="tab">{% translate "General" %}</a></li>
Expand Down