rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Normalize naming of all traditional master views

Browse source 
such names should never use plural forms.  for now what plural forms were
previously in use, should still work.  ideally can remove those at some point
This commit is contained in:
Lance Edgar 2021-01-28 16:32:25 -06:00
parent 3ad19d05e5
commit 719e7c8441
30 changed files with 273 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tailbone/views/messages.py
View file

@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar
# Copyright © 2010-2021 Lance Edgar
#
# This file is part of Rattail.
#
@ -42,7 +42,7 @@ from tailbone.views import MasterView
from tailbone.util import raw_datetime
class MessagesView(MasterView):
class MessageView(MasterView):
"""
Base class for message views.
"""
@ -87,12 +87,12 @@ class MessagesView(MasterView):
def index(self):
if not self.request.user:
raise httpexceptions.HTTPForbidden
return super(MessagesView, self).index()
return super(MessageView, self).index()
def get_instance(self):
if not self.request.user:
raise httpexceptions.HTTPForbidden
message = super(MessagesView, self).get_instance()
message = super(MessageView, self).get_instance()
if not self.associated_with(message):
raise httpexceptions.HTTPForbidden
return message
@ -204,7 +204,7 @@ class MessagesView(MasterView):
# TODO!!
# def make_form(self, instance, **kwargs):
# form = super(MessagesView, self).make_form(instance, **kwargs)
# form = super(MessageView, self).make_form(instance, **kwargs)
# if self.creating:
# form.id = 'new-message'
# form.cancel_url = self.request.get_referrer(default=self.request.route_url('messages.inbox'))
@ -212,7 +212,7 @@ class MessagesView(MasterView):
# return form
def configure_form(self, f):
super(MessagesView, self).configure_form(f)
super(MessageView, self).configure_form(f)
use_buefy = self.get_use_buefy()
f.submit_label = "Send Message"
@ -293,7 +293,7 @@ class MessagesView(MasterView):
def objectify(self, form, data=None):
if data is None:
data = form.validated
message = super(MessagesView, self).objectify(form, data)
message = super(MessageView, self).objectify(form, data)
if self.creating:
if self.request.user:
@ -469,8 +469,11 @@ class MessagesView(MasterView):
cls._defaults(config)
# TODO: deprecate / remove this
MessagesView = MessageView
class InboxView(MessagesView):
class InboxView(MessageView):
"""
Inbox message view.
"""
@ -486,7 +489,7 @@ class InboxView(MessagesView):
return q.filter(model.MessageRecipient.status == self.enum.MESSAGE_STATUS_INBOX)
class ArchiveView(MessagesView):
class ArchiveView(MessageView):
"""
Archived message view.
"""
@ -502,7 +505,7 @@ class ArchiveView(MessagesView):
return q.filter(model.MessageRecipient.status == self.enum.MESSAGE_STATUS_ARCHIVE)
class SentView(MessagesView):
class SentView(MessageView):
"""
Sent messages view.
"""
@ -585,4 +588,4 @@ def includeme(config):
config.add_view(SentView, attr='index', route_name='messages.sent',
permission='messages.list')
MessagesView.defaults(config)
MessageView.defaults(config)