changeset 2424:26fe624bdbd6

remove notification settings from userprefs, will add back as a new plugin
author Johannes Berg <johannes AT sipsolutions DOT net>
date Fri, 20 Jul 2007 00:28:46 +0200
parents 76bf8b6b3061
children c1592d799c53
files MoinMoin/config/multiconfig.py MoinMoin/userprefs/prefs.py
diffstat 2 files changed, 0 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Thu Jul 19 23:56:40 2007 +0200
+++ b/MoinMoin/config/multiconfig.py	Fri Jul 20 00:28:46 2007 +0200
@@ -534,7 +534,6 @@
         ('show_fancy_diff', lambda _: _('Show fancy diffs')),
         ('wikiname_add_spaces', lambda _: _('Add spaces to displayed wiki names')),
         ('remember_me', lambda _: _('Remember login information')),
-        ('want_trivial', lambda _: _('Subscribe to trivial changes')),
 
         ('disabled', lambda _: _('Disable this account forever')),
         # if an account is disabled, it may be used for looking up
--- a/MoinMoin/userprefs/prefs.py	Thu Jul 19 23:56:40 2007 +0200
+++ b/MoinMoin/userprefs/prefs.py	Fri Jul 20 00:28:46 2007 +0200
@@ -20,7 +20,6 @@
 # split the plugin into multiple preferences pages:
 #    - account details (name, email, timezone, ...)
 #    - wiki settings (editor, fancy diffs, theme, ...)
-#    - notification settings (trivial, subscribed pages, ...)
 #    - quick links (or leave in wiki settings?)
 ####
 
@@ -195,13 +194,6 @@
         # quicklinks for navibar
         theuser.quicklinks = self._decode_pagelist('quicklinks')
 
-        # subscription for page change notification
-        theuser.subscribed_pages = self._decode_pagelist('subscribed_pages')
-
-        # subscription to various events
-        available = events.get_subscribable_events()
-        theuser.subscribed_events = [ev for ev in form.get('events', [])]
-
         # save data
         theuser.save()
         if theuser.disabled:
@@ -401,33 +393,6 @@
                     .append('\n'.join(self.request.user.getQuickLinks())),
             ], valign="top")
 
-            # FIXME: this depends on Jabber ATM, but may not do so in the future
-            if self.cfg.jabber_enabled:
-                self.make_row(_('Subscribed events'), [self._event_select()])
-
-            # subscribed pages
-            if self.cfg.mail_enabled:
-                # Get list of subscribe pages, DO NOT sort! it should
-                # stay in the order the user entered it in his input
-                # box.
-                notifylist = self.request.user.getSubscriptionList()
-
-                warning = []
-                if not self.request.user.email:
-                    warning = [
-                        html.BR(),
-                        html.SMALL(Class="warning").append(
-                            _("This list does not work, unless you have"
-                              " entered a valid email address!")
-                        )]
-
-                self.make_row(
-                    html.Raw(_('Subscribed wiki pages (one regex per line)')),
-                    [html.TEXTAREA(name="subscribed_pages", rows="6", cols="50").append(
-                        '\n'.join(notifylist)),
-                    ] + warning,
-                    valign="top"
-                )
             self._form.append(html.INPUT(type="hidden", name="action", value="userprefs"))
             self._form.append(html.INPUT(type="hidden", name="handler", value="prefs"))