From 369d5849a90cdf013b978ba63fe6705cdbff4536 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 8 Dec 2016 12:13:45 -0600 Subject: [PATCH] Revert to `display_name` field for person views --- tailbone/views/people.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tailbone/views/people.py b/tailbone/views/people.py index 472afc30..4ef4f999 100644 --- a/tailbone/views/people.py +++ b/tailbone/views/people.py @@ -83,11 +83,11 @@ class PeopleView(MasterView): g.sorters['email'] = lambda q, d: q.order_by(getattr(model.PersonEmailAddress.address, d)()) g.sorters['phone'] = lambda q, d: q.order_by(getattr(model.PersonPhoneNumber.number, d)()) - g.default_sortkey = 'full_name' + g.default_sortkey = 'display_name' g.configure( include=[ - g.full_name, + g.display_name.label("Full Name"), g.first_name, g.last_name, g.phone.label("Phone Number"), @@ -108,6 +108,7 @@ class PeopleView(MasterView): raise HTTPNotFound def _preconfigure_fieldset(self, fs): + fs.display_name.set(label="Full Name") fs.phone.set(label="Phone Number", readonly=True) fs.email.set(label="Email Address", readonly=True) fs.address.set(label="Mailing Address", readonly=True) @@ -116,7 +117,7 @@ class PeopleView(MasterView): def configure_fieldset(self, fs): fs.configure( include=[ - fs.full_name, + fs.display_name, fs.first_name, fs.middle_name, fs.last_name, @@ -130,7 +131,7 @@ class PeopleView(MasterView): class PeopleAutocomplete(AutocompleteView): mapped_class = model.Person - fieldname = 'full_name' + fieldname = 'display_name' class PeopleEmployeesAutocomplete(PeopleAutocomplete):