diff options
| author | Filipp Lepalaan <filipp@mac.com> | 2015-10-13 22:43:28 +0300 |
|---|---|---|
| committer | Filipp Lepalaan <filipp@mac.com> | 2015-10-13 22:43:28 +0300 |
| commit | 5d5415d29daa990d27913da638a6e2bc30afb4e8 (patch) | |
| tree | 6209d223da8094f65f7f73fde1376c0b189fd5be /servo | |
| parent | 8045bf7033aff5c66069424844b5fc6585ab06cd (diff) | |
| download | Servo-5d5415d29daa990d27913da638a6e2bc30afb4e8.tar.gz Servo-5d5415d29daa990d27913da638a6e2bc30afb4e8.tar.bz2 Servo-5d5415d29daa990d27913da638a6e2bc30afb4e8.zip | |
Cleanup
Diffstat (limited to 'servo')
| -rwxr-xr-x | servo/templates/accounts/settings.html | 1 | ||||
| -rw-r--r-- | servo/templates/checkin/index.html | 2 | ||||
| -rw-r--r-- | servo/templates/checkin/newindex.html | 6 | ||||
| -rw-r--r-- | servo/views/checkin.py | 8 |
4 files changed, 9 insertions, 8 deletions
diff --git a/servo/templates/accounts/settings.html b/servo/templates/accounts/settings.html index a48ab19..ab32b39 100755 --- a/servo/templates/accounts/settings.html +++ b/servo/templates/accounts/settings.html @@ -33,7 +33,6 @@ <div class="tab-pane" id="tab4"> {% include "form_field_snippet.html" with field=form.tech_id %} {% include "form_field_snippet.html" with field=form.gsx_userid %} - {% include "form_field_snippet.html" with field=form.gsx_password %} {% include "form_field_snippet.html" with field=form.gsx_poprefix %} </div> </div> diff --git a/servo/templates/checkin/index.html b/servo/templates/checkin/index.html index 9ecc884..2995be5 100644 --- a/servo/templates/checkin/index.html +++ b/servo/templates/checkin/index.html @@ -40,6 +40,8 @@ <ul class="dropdown-menu"> {% for u in request.session.checkin_users %} <li{% if u.pk == request.session.checkin_user %} class="active"{% endif %}><a href="?u={{ u.pk|safe }}">{{ u.name }}</a></li> + {% empty %} + <li class="disabled"><a href="#">{% trans "No users found" %}</a></li> {% endfor %} <li class="divider"></li> <li><a href="{% url 'accounts-list_orders' user.username %}">{% bootstrap_icon "log-in" %} {% trans "Go to Servo" %}</a></li> diff --git a/servo/templates/checkin/newindex.html b/servo/templates/checkin/newindex.html index 41a6a05..7c04fb8 100644 --- a/servo/templates/checkin/newindex.html +++ b/servo/templates/checkin/newindex.html @@ -87,9 +87,9 @@ <input type="checkbox" name="tags" value="{{ t.id|safe }}"/> {% bootstrap_icon "tag" %} {{ t.title }} </label> </div> - {% endfor %} - </div> - </div> + {% endfor %} + </div> + </div> </div> </div> {% endif %} diff --git a/servo/views/checkin.py b/servo/views/checkin.py index 323da3e..16d852c 100644 --- a/servo/views/checkin.py +++ b/servo/views/checkin.py @@ -19,11 +19,11 @@ from servo.lib.utils import json_response from servo.views.order import put_on_paper from servo.validators import apple_sn_validator from servo.models import (User, Device, GsxAccount, Order, - Customer, Location, Note, Attachment, - Configuration, ChecklistItem, Tag,) + Customer, Location, Note, Attachment, + Configuration, ChecklistItem, Tag,) from servo.forms import (SerialNumberForm, AppleSerialNumberForm, - DeviceForm, IssueForm, CustomerForm, - QuestionForm, AttachmentForm, StatusCheckForm,) + DeviceForm, IssueForm, CustomerForm, + QuestionForm, AttachmentForm, StatusCheckForm,) def init_locale(request): |