← Back to branch summary

~divmod-dev/divmod.org/lsbranch-1195

« back to all changes in this revision

Viewing changes to Mantissa/xmantissa/signup.py

  • Committer: exarkun
  • Date: 2007-12-02 15:34:18 UTC
  • Revision ID: svn-v4:866e43f7-fbfc-0310-8f2a-ec88d1da2979:trunk:14430
Revert r14421, r14420, and r14404 - test suite regression

xmantissa.test.test_offering.OfferingPluginTest.test_getOfferings fails with these
changesets.

reopens #2413

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mantissa/xmantissa/signup.py
32
32
    INavigableFragment, ISignupMechanism)
33
33
from xmantissa.website import PrefixURLMixin, WebSite
34
34
from xmantissa.websession import usernameFromRequest
35
 
from xmantissa.publicweb import PublicAthenaLivePage, PublicPage
 
35
from xmantissa.publicweb import _getLoader
 
36
from xmantissa.publicresource import PublicAthenaLivePage, PublicPage, getLoader
36
37
from xmantissa.webnav import Tab
37
 
from xmantissa.webtheme import SiteTemplateResolver, getLoader
38
38
from xmantissa.webapp import PrivateApplication
39
39
from xmantissa import plugins, liveform
40
40
from xmantissa.websession import PersistentSession
64
64
    - What happens when the provided username doesn't exist.
65
65
    - What happens when the provided passwords mismatch.
66
66
    - What happens when the user doesn't have an external account registered.
67
 
 
68
 
    @param store: a site store containing a L{WebSite}.
69
 
    @type store: L{axiom.store.Store}.
70
 
 
71
 
    @param templateResolver: a template resolver instance that will return
72
 
    the appropriate doc factory.
73
67
    """
74
68
 
75
69
    attempt = None
76
70
 
77
 
    def __init__(self, store, templateResolver=None):
78
 
        if templateResolver is None:
79
 
            templateResolver = SiteTemplateResolver(store)
80
 
        PublicPage.__init__(self, None, store,
81
 
                            templateResolver.getDocFactory('reset'),
82
 
                            None, None, templateResolver)
 
71
    def __init__(self, store):
 
72
        PublicPage.__init__(self, None, store, _getLoader(store, 'reset'),
 
73
                            None, None)
83
74
        self.store = store
84
75
        self.loginSystem = store.findUnique(userbase.LoginSystem, default=None)
85
76
 
98
89
            if req.args.get('username', ('',))[0]:
99
90
                user = unicode(usernameFromRequest(req), 'ascii')
100
91
                self.handleRequestForUser(user, URL.fromContext(ctx))
101
 
                self.fragment = self.templateResolver.getDocFactory(
102
 
                    'reset-check-email')
 
92
                self.fragment = _getLoader(self.store, 'reset-check-email')
103
93
            elif req.args.get('email', ('',))[0]:
104
94
                email = req.args['email'][0].decode('ascii')
105
95
                acct = self.accountByAddress(email)
107
97
                    username = '@'.join(
108
98
                        userbase.getAccountNames(acct.avatars.open()).next())
109
99
                    self.handleRequestForUser(username, URL.fromContext(ctx))
110
 
                self.fragment = self.templateResolver.getDocFactory('reset-check-email')
 
100
                self.fragment = _getLoader(self.store, 'reset-check-email')
111
101
            else:
112
102
                (password,) = req.args['password1']
113
103
                self.resetPassword(self.attempt, unicode(password))
114
 
                self.fragment = self.templateResolver.getDocFactory('reset-done')
 
104
                self.fragment = _getLoader(self.store, 'reset-done')
115
105
        elif self.attempt:
116
 
            self.fragment = self.templateResolver.getDocFactory('reset-step-two')
 
106
            self.fragment = _getLoader(self.store, 'reset-step-two')
117
107
 
118
108
        return PublicPage.renderHTTP(self, ctx)
119
109