Hopefully fix some bugs with people view(s)

This commit is contained in:
Lance Edgar 2016-12-07 20:36:54 -06:00
parent cebde053ad
commit 96ef75a75d

View file

@ -83,11 +83,11 @@ class PeopleView(MasterView):
g.sorters['email'] = lambda q, d: q.order_by(getattr(model.PersonEmailAddress.address, d)()) 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.sorters['phone'] = lambda q, d: q.order_by(getattr(model.PersonPhoneNumber.number, d)())
g.default_sortkey = 'display_name' g.default_sortkey = 'full_name'
g.configure( g.configure(
include=[ include=[
g.display_name.label("Full Name"), g.full_name,
g.first_name, g.first_name,
g.last_name, g.last_name,
g.phone.label("Phone Number"), g.phone.label("Phone Number"),
@ -108,7 +108,6 @@ class PeopleView(MasterView):
raise HTTPNotFound raise HTTPNotFound
def _preconfigure_fieldset(self, fs): def _preconfigure_fieldset(self, fs):
fs.display_name.set(label="Full Name")
fs.phone.set(label="Phone Number", readonly=True) fs.phone.set(label="Phone Number", readonly=True)
fs.email.set(label="Email Address", readonly=True) fs.email.set(label="Email Address", readonly=True)
fs.address.set(label="Mailing Address", readonly=True) fs.address.set(label="Mailing Address", readonly=True)
@ -117,7 +116,7 @@ class PeopleView(MasterView):
def configure_fieldset(self, fs): def configure_fieldset(self, fs):
fs.configure( fs.configure(
include=[ include=[
fs.display_name, fs.full_name,
fs.first_name, fs.first_name,
fs.middle_name, fs.middle_name,
fs.last_name, fs.last_name,
@ -131,7 +130,7 @@ class PeopleView(MasterView):
class PeopleAutocomplete(AutocompleteView): class PeopleAutocomplete(AutocompleteView):
mapped_class = model.Person mapped_class = model.Person
fieldname = 'display_name' fieldname = 'full_name'
class PeopleEmployeesAutocomplete(PeopleAutocomplete): class PeopleEmployeesAutocomplete(PeopleAutocomplete):