diff --git a/tailbone/forms/renderers/__init__.py b/tailbone/forms/renderers/__init__.py index c361b681..8737df53 100644 --- a/tailbone/forms/renderers/__init__.py +++ b/tailbone/forms/renderers/__init__.py @@ -32,8 +32,9 @@ from .common import (AutocompleteFieldRenderer, EnumFieldRenderer, YesNoFieldRenderer) from .people import (PersonFieldRenderer, PersonFieldLinkRenderer, - CustomerFieldRenderer, CustomerFieldLinkRenderer, - UserFieldRenderer) + CustomerFieldRenderer, CustomerFieldLinkRenderer) + +from .users import UserFieldRenderer from .employees import EmployeeFieldRenderer diff --git a/tailbone/forms/renderers/people.py b/tailbone/forms/renderers/people.py index 46c20902..d1a1ee93 100644 --- a/tailbone/forms/renderers/people.py +++ b/tailbone/forms/renderers/people.py @@ -1,9 +1,8 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2012 Lance Edgar +# Copyright © 2010-2016 Lance Edgar # # This file is part of Rattail. # @@ -21,19 +20,18 @@ # along with Rattail. If not, see . # ################################################################################ - """ People Field Renderers """ -from formalchemy.fields import TextFieldRenderer +from __future__ import unicode_literals, absolute_import + from .common import AutocompleteFieldRenderer from webhelpers.html import tags __all__ = ['PersonFieldRenderer', 'PersonFieldLinkRenderer', - 'CustomerFieldRenderer', 'CustomerFieldLinkRenderer', - 'UserFieldRenderer'] + 'CustomerFieldRenderer', 'CustomerFieldLinkRenderer'] class PersonFieldRenderer(AutocompleteFieldRenderer): @@ -78,15 +76,3 @@ class CustomerFieldLinkRenderer(CustomerFieldRenderer): unicode(customer), self.request.route_url('customers.view', uuid=customer.uuid)) return u'' - - -class UserFieldRenderer(TextFieldRenderer): - """ - Renderer for :class:`rattail.db.model.User` instance fields. - """ - - def render_readonly(self, **kwargs): - user = self.raw_value - if user: - return user.display_name - return u'' diff --git a/tailbone/forms/renderers/users.py b/tailbone/forms/renderers/users.py new file mode 100644 index 00000000..ae4cc5a3 --- /dev/null +++ b/tailbone/forms/renderers/users.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +################################################################################ +# +# Rattail -- Retail Software Framework +# Copyright © 2010-2016 Lance Edgar +# +# This file is part of Rattail. +# +# Rattail is free software: you can redistribute it and/or modify it under the +# terms of the GNU Affero General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for +# more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Rattail. If not, see . +# +################################################################################ +""" +User Field Renderers +""" + +from __future__ import unicode_literals, absolute_import + +import formalchemy + + +class UserFieldRenderer(formalchemy.TextFieldRenderer): + """ + Renderer for :class:`rattail:rattail.db.model.User` instance fields. + """ + + def render_readonly(self, **kwargs): + user = self.raw_value + if not user: + return '' + return user.display_name