Commits

ana-balica  committed 246904e

change simple occurences of subscribed_items to subscriptions

  • Participants
  • Parent commits da8b2a0

Comments (0)

Files changed (3)

File MoinMoin/config/default.py

             DISABLED: False,
             BOOKMARKS: {},
             QUICKLINKS: [],
-            SUBSCRIBED_ITEMS: [],
-            SUBSCRIPTION_IDS: [],
+            SUBSCRIPTIONS: [],
             EMAIL_SUBSCRIBED_EVENTS: [
                 # XXX PageChangedEvent.__name__
                 # XXX PageRenamedEvent.__name__

File MoinMoin/items/ticket.py

 from MoinMoin.forms import (Form, OptionalText, OptionalMultilineText, SmallNatural, Tags,
                             Reference, BackReference, SelectSubmit)
 from MoinMoin.storage.middleware.protecting import AccessDenied
-from MoinMoin.constants.keys import ITEMTYPE, CONTENTTYPE, ITEMID, CURRENT, SUPERSEDED_BY, DEPENDS_ON, SUBSCRIBED_ITEMS
+from MoinMoin.constants.keys import (ITEMTYPE, CONTENTTYPE, ITEMID, CURRENT,
+                                     SUPERSEDED_BY, SUBSCRIPTIONS, DEPENDS_ON)
 from MoinMoin.constants.contenttypes import CONTENTTYPE_USER
 from MoinMoin.items import Item, Contentful, register, BaseModifyForm
 from MoinMoin.items.content import NonExistentContent
         id_ = item.meta[ITEMID]
         self['supersedes'].set(Term(SUPERSEDED_BY, id_))
         self['required_by'].set(Term(DEPENDS_ON, id_))
-        self['subscribers'].set(Term(SUBSCRIBED_ITEMS, id_))
+        self['subscribers'].set(Term(SUBSCRIPTIONS, id_))
 
 
 class TicketForm(BaseModifyForm):

File MoinMoin/script/account/disable.py

             u.name = u"{0}-{1}".format(u.name, u.id)
             if u.email:
                 u.email = u"{0}-{1}".format(u.email, u.id)
-            u.subscribed_items = []  # avoid using email
+            u.subscriptions = []
             u.save()
             print "- disabled."
         else: