Download as
Browse Code »

Commit 9c5f384a9b347cfc2928f8c1e8f23c63665fb94c

Authored by ailsoncgt
1 parent f909c059
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Bug manage users #184

Showing 2 changed files with 7 additions and 5 deletions   Show diff stats
users/templates/list_users.html
  Diff comments   View file @9c5f384
... ... @@ -37,11 +37,13 @@
37 37 {% endif %}
38 38 <form action="" method="GET" class="form-horizontal">
39 39 <div class="form-group">
40   - <div class="col-md-9 col-sm-9 col-xs-9">
  40 + <div class="col-md-11 col-sm-11 col-xs-11">
41 41 <input type="text" class="form-control" name="search" placeholder="{% trans 'Search...' %}" />
42 42 </div>
43   - <div class="col-md-3 col-sm-3 col-xs-3">
44   - <input type="submit" class="btn btn-primary" value="{% trans 'Search' %}" />
  43 + <div class="col-md-1 col-sm-1 col-xs-1">
  44 + <button type="submit" class="btn btn-fab btn-fab-mini">
  45 + <i class="material-icons">search</i>
  46 + </button>
45 47 </div>
46 48 </div>
47 49 </form>
... ... @@ -68,7 +70,7 @@
68 70 <p>{% trans 'Contact' %}: {{ acc.phone }}</p>
69 71 <div align="right">
70 72 <a href="{% url 'users:update' acc.username %}" class="btn btn-raised btn-success">{% trans 'Edit' %}</a>
71   - <a href="javascript:void(0)" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#DeleteModal{{ forloop.counter }}">{% trans 'Delete' %}</a>
  73 + <a href="javascript:void(0)" class="btn btn-danger btn-raised btn-lg" data-toggle="modal" data-target="#DeleteModal{{ forloop.counter }}">{% trans 'Delete' %}</a>
72 74 </div>
73 75 </div>
74 76  
... ...
users/views.py
  Diff comments   View file @9c5f384
... ... @@ -26,7 +26,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
26 26 if search is None:
27 27 users = User.objects.exclude(username = self.request.user.username)
28 28 else:
29   - users = User.objects.filter(Q(username = search) | Q(name__icontains = search))
  29 + users = User.objects.filter(Q(username = search) | Q(name = search) | Q(name__icontains = search) | Q(username__icontains = search)).exclude( username = self.request.user.username)
30 30  
31 31 return users
32 32  
... ...