changeset 2159:246904e49804

change simple occurences of subscribed_items to subscriptions
author Ana Balica <ana.balica@gmail.com>
date Sat, 20 Jul 2013 21:24:51 +0300
parents da8b2a06ebec
children 8ce664067edb
files MoinMoin/config/default.py MoinMoin/items/ticket.py MoinMoin/script/account/disable.py
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/default.py	Sat Jul 20 21:20:43 2013 +0300
+++ b/MoinMoin/config/default.py	Sat Jul 20 21:24:51 2013 +0300
@@ -489,8 +489,7 @@
             DISABLED: False,
             BOOKMARKS: {},
             QUICKLINKS: [],
-            SUBSCRIBED_ITEMS: [],
-            SUBSCRIPTION_IDS: [],
+            SUBSCRIPTIONS: [],
             EMAIL_SUBSCRIBED_EVENTS: [
                 # XXX PageChangedEvent.__name__
                 # XXX PageRenamedEvent.__name__
--- a/MoinMoin/items/ticket.py	Sat Jul 20 21:20:43 2013 +0300
+++ b/MoinMoin/items/ticket.py	Sat Jul 20 21:24:51 2013 +0300
@@ -22,7 +22,8 @@
 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
@@ -59,7 +60,7 @@
         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):
--- a/MoinMoin/script/account/disable.py	Sat Jul 20 21:20:43 2013 +0300
+++ b/MoinMoin/script/account/disable.py	Sat Jul 20 21:24:51 2013 +0300
@@ -45,7 +45,7 @@
             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: