From b998aa1e8a0a76eedba9d40c40a9d2c5bfeb3d47 Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Fri, 26 Oct 2018 11:43:48 -0400 Subject: Improved Collaborators UX Some small improvements based on feedback from Trevor. - Changed lable from "users" to "collaborators" to try and be more clear - Do not show your own name in the dropdown by default - You cannot select yourself as a collaborator Change-Id: Ie2e9070232765ed9eabe6657924ed8addaa0165a Signed-off-by: Parker Berberian --- dashboard/src/templates/booking/steps/booking_meta.html | 3 ++- dashboard/src/workflow/forms.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dashboard/src/templates/booking/steps/booking_meta.html b/dashboard/src/templates/booking/steps/booking_meta.html index fa8f7a9..a42e158 100644 --- a/dashboard/src/templates/booking/steps/booking_meta.html +++ b/dashboard/src/templates/booking/steps/booking_meta.html @@ -43,7 +43,8 @@
- {% bootstrap_field form.users %} +

You may add collaborators on your booking to share resources with coworkers.

+ {% bootstrap_field form.users label="Collaborators" %}
{% buttons %} diff --git a/dashboard/src/workflow/forms.py b/dashboard/src/workflow/forms.py index c770e38..d4abbc3 100644 --- a/dashboard/src/workflow/forms.py +++ b/dashboard/src/workflow/forms.py @@ -189,6 +189,7 @@ class BookingMetaForm(forms.Form): default_user = kwargs.pop("default_user") else: default_user = "you" + self.default_user = default_user if "chosen_users" in kwargs: chosen_users = kwargs.pop("chosen_users") elif data and "users" in data: @@ -212,7 +213,7 @@ class BookingMetaForm(forms.Form): """ try: users = {} - d_qset = UserProfile.objects.select_related('user').all(); + d_qset = UserProfile.objects.select_related('user').all().exclude(user__username=self.default_user); for userprofile in d_qset: user = { 'id':userprofile.user.id, @@ -237,7 +238,6 @@ class BookingMetaForm(forms.Form): 'selectable_limit': -1, 'name': "users", 'placeholder': "username", - 'default_entry': default_user, 'initial': chosen_users, 'edit': False } -- cgit 1.2.3-korg