Commit 9fa6c02c5348c2a188ec54a2d59f5f138b302d5f
1 parent
955337a6
Exists in
master
and in
5 other branches
Check form error for fade tab #211
Showing
1 changed file
with
12 additions
and
4 deletions
Show diff stats
app/templates/admin_settings.html
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | <!-- Nav tabs --> |
| 20 | 20 | <ul class="nav nav-tabs md-pills pills-ins" role="tablist"> |
| 21 | 21 | <li class="nav-item"> |
| 22 | - {% if form.errors %} | |
| 22 | + {% if form.safe_conection.errors or form.host.errors or form.default_from_email.errors %} | |
| 23 | 23 | <a class="nav-link" data-toggle="tab" href="#panel1" role="tab"><i class="fa fa-cog"></i> {% trans "System" %}</a> |
| 24 | 24 | </li> |
| 25 | 25 | <li class="nav-item"> |
| ... | ... | @@ -41,7 +41,11 @@ |
| 41 | 41 | <!-- Tab panels --> |
| 42 | 42 | <div class="tab-content"> |
| 43 | 43 | <!--Panel 1--> |
| 44 | + {% if form.errors %} | |
| 45 | + <div class="tab-pane fade" id="panel1" role="tabpanel"> | |
| 46 | + {% else %} | |
| 44 | 47 | <div class="tab-pane fade in active" id="panel1" role="tabpanel"> |
| 48 | + {% endif %} | |
| 45 | 49 | <div class="panel panel-default"> |
| 46 | 50 | <div class="panel-body"> |
| 47 | 51 | <h3><b>{% trans "General" %}</b></h3> |
| ... | ... | @@ -57,7 +61,11 @@ |
| 57 | 61 | <!--/.Panel 1--> |
| 58 | 62 | |
| 59 | 63 | <!--Panel 2--> |
| 64 | + {% if form.errors %} | |
| 65 | + <div class="tab-pane fade in active" id="panel2" role="tabpanel"> | |
| 66 | + {% else %} | |
| 60 | 67 | <div class="tab-pane fade" id="panel2" role="tabpanel"> |
| 68 | + {% endif %} | |
| 61 | 69 | <div class="panel panel-default"> |
| 62 | 70 | <form class="form-horizontal" method="post"> |
| 63 | 71 | {% csrf_token %} |
| ... | ... | @@ -223,13 +231,13 @@ |
| 223 | 231 | </div> |
| 224 | 232 | </div> |
| 225 | 233 | </div> |
| 226 | - {% if form.safe_connection.errors %} | |
| 234 | + {% if form.safe_conection.errors %} | |
| 227 | 235 | <div class="alert alert-danger alert-dismissible clearfix" role="alert"> |
| 228 | 236 | <button type="button" class="close" data-dismiss="alert" aria-label="Close"> |
| 229 | 237 | <span aria-hidden="true">×</span> |
| 230 | 238 | </button> |
| 231 | 239 | <ul> |
| 232 | - {% for error in form.safe_connection.errors %} | |
| 240 | + {% for error in form.safe_conection.errors %} | |
| 233 | 241 | <li>{{ error }}</li> |
| 234 | 242 | {% endfor %} |
| 235 | 243 | </ul> |
| ... | ... | @@ -237,7 +245,7 @@ |
| 237 | 245 | {% endif %} |
| 238 | 246 | </div> |
| 239 | 247 | </div> |
| 240 | - <button type="submit" class="btn btn-success btn-raised">{% trans "Save changes" %}</button> | |
| 248 | + <button type="submit" class="btn btn-success btn-raised" name="submit-settings">{% trans "Save changes" %}</button> | |
| 241 | 249 | </div> |
| 242 | 250 | </form> |
| 243 | 251 | </div> | ... | ... |