Mercurial > p > roundup > code

annotate roundup/cgi/client.py @ 1467:378081f066cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
registration is now a two-step process with confirmation from the email address supplied in the registration form fixed [SF#687771] too (now handle all cases of @/:)
author Richard Jones <richard@users.sourceforge.net>
date Tue, 25 Feb 2003 10:19:32 +0000
parents 745ceee35ca2
children f57759a5ee1a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1 # $Id: client.py,v 1.97 2003-02-25 10:19:32 richard Exp $
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
2
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
3 __doc__ = """
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
4 WWW request handler (also used in the stand-alone server).
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
5 """
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
6
1008
10ed4791f969 Wrote most of the upgrading documentation (please read!)
Richard Jones <richard@users.sourceforge.net>
parents: 1005
diff changeset
7 import os, os.path, cgi, StringIO, urlparse, re, traceback, mimetypes, urllib
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
8 import binascii, Cookie, time, random, MimeWriter, smtplib, socket, quopri
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
9
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
10 from roundup import roundupdb, date, hyperdb, password
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
11 from roundup.i18n import _
1204
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
12 from roundup.cgi.templating import Templates, HTMLRequest, NoTemplate
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
13 from roundup.cgi import cgitb
1078
344bad728d10 more tweakage of help display and style issues
Richard Jones <richard@users.sourceforge.net>
parents: 1076
diff changeset
14 from roundup.cgi.PageTemplates import PageTemplate
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
15 from roundup.rfc2822 import encode_header
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
16
1456
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
17 class HTTPException(Exception):
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
18 pass
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
19 class Unauthorised(HTTPException):
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
20 pass
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
21 class NotFound(HTTPException):
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
22 pass
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
23 class Redirect(HTTPException):
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
24 pass
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
25
1456
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
26 # XXX actually _use_ FormError
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
27 class FormError(ValueError):
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
28 ''' An "expected" exception occurred during form parsing.
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
29 - ie. something we know can go wrong, and don't want to alarm the
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
30 user with
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
31
1456
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
32 We trap this at the user interface level and feed back a nice error
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
33 to the user.
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
34 '''
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
35 pass
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
36
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
37 class SendFile(Exception):
1456
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
38 ''' Send a file from the database '''
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
39
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
40 class SendStaticFile(Exception):
1456
745ceee35ca2 beginnings of nicer web error handling
Richard Jones <richard@users.sourceforge.net>
parents: 1447
diff changeset
41 ''' Send a static file from the instance html directory '''
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
42
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
43 def initialiseSecurity(security):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
44 ''' Create some Permissions and Roles on the security object
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
45
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
46 This function is directly invoked by security.Security.__init__()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
47 as a part of the Security object instantiation.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
48 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
49 security.addPermission(name="Web Registration",
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
50 description="User may register through the web")
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
51 p = security.addPermission(name="Web Access",
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
52 description="User may access the web interface")
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
53 security.addPermissionToRole('Admin', p)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
54
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
55 # doing Role stuff through the web - make sure Admin can
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
56 p = security.addPermission(name="Web Roles",
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
57 description="User may manipulate user Roles through the web")
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
58 security.addPermissionToRole('Admin', p)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
59
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
60 class Client:
1244
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
61 ''' Instantiate to handle one CGI request.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
62
1244
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
63 See inner_main for request processing.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
64
1244
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
65 Client attributes at instantiation:
1157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
66 "path" is the PATH_INFO inside the instance (with no leading '/')
1004
5f12d3259f31 logout works better now
Richard Jones <richard@users.sourceforge.net>
parents: 1003
diff changeset
67 "base" is the base URL for the instance
1244
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
68 "form" is the cgi form, an instance of FieldStorage from the standard
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
69 cgi module
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
70 "additional_headers" is a dictionary of additional HTTP headers that
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
71 should be sent to the client
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
72 "response_code" is the HTTP response code to send to the client
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
73
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
74 During the processing of a request, the following attributes are used:
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
75 "error_message" holds a list of error messages
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
76 "ok_message" holds a list of OK messages
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
77 "session" is the current user session id
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
78 "user" is the current user's name
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
79 "userid" is the current user's id
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
80 "template" is the current :template context
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
81 "classname" is the current class context name
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
82 "nodeid" is the current context item id
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
83
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
84 User Identification:
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
85 If the user has no login cookie, then they are anonymous and are logged
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
86 in as that user. This typically gives them all Permissions assigned to the
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
87 Anonymous Role.
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
88
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
89 Once a user logs in, they are assigned a session. The Client instance
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
90 keeps the nodeid of the session as the "session" attribute.
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
91
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
92
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
93 Special form variables:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
94 Note that in various places throughout this code, special form
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
95 variables of the form :<name> are used. The colon (":") part may
1436
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
96 actually be one of either ":" or "@".
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
97 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
98
1421
90bb11eb40dc oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents: 1420
diff changeset
99 #
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
100 # special form variables
1421
90bb11eb40dc oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents: 1420
diff changeset
101 #
1436
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
102 FV_TEMPLATE = re.compile(r'[@:]template')
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
103 FV_OK_MESSAGE = re.compile(r'[@:]ok_message')
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
104 FV_ERROR_MESSAGE = re.compile(r'[@:]error_message')
1421
90bb11eb40dc oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents: 1420
diff changeset
105
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
106 FV_QUERYNAME = re.compile(r'[@:]queryname')
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
107
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
108 # edit form variable handling (see unit tests)
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
109 FV_LABELS = r'''
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
110 ^(
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
111 (?P<note>[@:]note)|
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
112 (?P<file>[@:]file)|
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
113 (
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
114 ((?P<classname>%s)(?P<id>[-\d]+))? # optional leading designator
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
115 ((?P<required>[@:]required$)| # :required
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
116 (
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
117 (
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
118 (?P<add>[@:]add[@:])| # :add:<prop>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
119 (?P<remove>[@:]remove[@:])| # :remove:<prop>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
120 (?P<confirm>[@:]confirm[@:])| # :confirm:<prop>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
121 (?P<link>[@:]link[@:])| # :link:<prop>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
122 ([@:]) # just a separator
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
123 )?
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
124 (?P<propname>[^@:]+) # <prop>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
125 )
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
126 )
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
127 )
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
128 )$'''
1421
90bb11eb40dc oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents: 1420
diff changeset
129
90bb11eb40dc oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents: 1420
diff changeset
130 # Note: index page stuff doesn't appear here:
90bb11eb40dc oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents: 1420
diff changeset
131 # columns, sort, sortdir, filter, group, groupdir, search_text,
90bb11eb40dc oops, forgot the templating :)
Richard Jones <richard@users.sourceforge.net>
parents: 1420
diff changeset
132 # pagesize, startwith
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
133
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
134 def __init__(self, instance, request, env, form=None):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
135 hyperdb.traceMark()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
136 self.instance = instance
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
137 self.request = request
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
138 self.env = env
1004
5f12d3259f31 logout works better now
Richard Jones <richard@users.sourceforge.net>
parents: 1003
diff changeset
139
1157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
140 # save off the path
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
141 self.path = env['PATH_INFO']
1004
5f12d3259f31 logout works better now
Richard Jones <richard@users.sourceforge.net>
parents: 1003
diff changeset
142
1398
b3e1e9ab0500 fixed cookie path to use TRACKER_WEB [SF#667020]
Richard Jones <richard@users.sourceforge.net>
parents: 1393
diff changeset
143 # this is the base URL for this tracker
1157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
144 self.base = self.instance.config.TRACKER_WEB
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
145
1398
b3e1e9ab0500 fixed cookie path to use TRACKER_WEB [SF#667020]
Richard Jones <richard@users.sourceforge.net>
parents: 1393
diff changeset
146 # this is the "cookie path" for this tracker (ie. the path part of
b3e1e9ab0500 fixed cookie path to use TRACKER_WEB [SF#667020]
Richard Jones <richard@users.sourceforge.net>
parents: 1393
diff changeset
147 # the "base" url)
b3e1e9ab0500 fixed cookie path to use TRACKER_WEB [SF#667020]
Richard Jones <richard@users.sourceforge.net>
parents: 1393
diff changeset
148 self.cookie_path = urlparse.urlparse(self.base)[2]
1414
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
149 self.cookie_name = 'roundup_session_' + re.sub('[^a-zA-Z]', '',
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
150 self.instance.config.TRACKER_NAME)
1398
b3e1e9ab0500 fixed cookie path to use TRACKER_WEB [SF#667020]
Richard Jones <richard@users.sourceforge.net>
parents: 1393
diff changeset
151
1157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
152 # see if we need to re-parse the environment for the form (eg Zope)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
153 if form is None:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
154 self.form = cgi.FieldStorage(environ=env)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
155 else:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
156 self.form = form
1157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
158 # turn debugging on/off
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
159 try:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
160 self.debug = int(env.get("ROUNDUP_DEBUG", 0))
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
161 except ValueError:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
162 # someone gave us a non-int debug level, turn it off
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
163 self.debug = 0
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
164
1157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
165 # flag to indicate that the HTTP headers have been sent
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
166 self.headers_done = 0
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
167
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
168 # additional headers to send with the request - must be registered
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
169 # before the first write
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
170 self.additional_headers = {}
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
171 self.response_code = 200
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
172
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
173
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
174 def main(self):
1133
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
175 ''' Wrap the real main in a try/finally so we always close off the db.
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
176 '''
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
177 try:
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
178 self.inner_main()
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
179 finally:
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
180 if hasattr(self, 'db'):
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
181 self.db.close()
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
182
36ec30d286ea Cleaned up CHANGES/TODO
Richard Jones <richard@users.sourceforge.net>
parents: 1130
diff changeset
183 def inner_main(self):
1054
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
184 ''' Process a request.
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
185
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
186 The most common requests are handled like so:
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
187 1. figure out who we are, defaulting to the "anonymous" user
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
188 see determine_user
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
189 2. figure out what the request is for - the context
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
190 see determine_context
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
191 3. handle any requested action (item edit, search, ...)
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
192 see handle_action
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
193 4. render a template, resulting in HTML output
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
194
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
195 In some situations, exceptions occur:
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
196 - HTTP Redirect (generally raised by an action)
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
197 - SendFile (generally raised by determine_context)
1055
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
198 serve up a FileClass "content" property
1054
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
199 - SendStaticFile (generally raised by determine_context)
1055
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
200 serve up a file from the tracker "html" directory
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
201 - Unauthorised (generally raised by an action)
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
202 the action is cancelled, the request is rendered and an error
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
203 message is displayed indicating that permission was not
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
204 granted for the action to take place
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
205 - NotFound (raised wherever it needs to be)
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
206 percolates up to the CGI interface that called the client
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
207 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
208 self.ok_message = []
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
209 self.error_message = []
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
210 try:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
211 # make sure we're identified (even anonymously)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
212 self.determine_user()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
213 # figure out the context and desired content template
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
214 self.determine_context()
1054
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
215 # possibly handle a form submit action (may change self.classname
3d8ea16347aa more explanatory docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1053
diff changeset
216 # and self.template, and may also append error/ok_messages)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
217 self.handle_action()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
218 # now render the page
1130
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
219
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
220 # we don't want clients caching our dynamic pages
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
221 self.additional_headers['Cache-Control'] = 'no-cache'
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
222 self.additional_headers['Pragma'] = 'no-cache'
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
223 self.additional_headers['Expires'] = 'Thu, 1 Jan 1970 00:00:00 GMT'
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
224
1204
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
225 # render the content
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
226 self.write(self.renderContext())
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
227 except Redirect, url:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
228 # let's redirect - if the url isn't None, then we need to do
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
229 # the headers, otherwise the headers have been set before the
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
230 # exception was raised
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
231 if url:
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
232 self.additional_headers['Location'] = url
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
233 self.response_code = 302
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
234 self.write('Redirecting to <a href="%s">%s</a>'%(url, url))
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
235 except SendFile, designator:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
236 self.serve_file(designator)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
237 except SendStaticFile, file:
1027
9990a635de03 hrm, wonder how that snuck in
Richard Jones <richard@users.sourceforge.net>
parents: 1018
diff changeset
238 self.serve_static_file(str(file))
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
239 except Unauthorised, message:
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
240 self.classname = None
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
241 self.template = ''
1244
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
242 self.error_message.append(message)
8dd4f736370b merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents: 1236
diff changeset
243 self.write(self.renderContext())
1210
619ab5de5af0 [SF#613310] traceback on onexistant items
Richard Jones <richard@users.sourceforge.net>
parents: 1204
diff changeset
244 except NotFound:
619ab5de5af0 [SF#613310] traceback on onexistant items
Richard Jones <richard@users.sourceforge.net>
parents: 1204
diff changeset
245 # pass through
619ab5de5af0 [SF#613310] traceback on onexistant items
Richard Jones <richard@users.sourceforge.net>
parents: 1204
diff changeset
246 raise
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
247 except:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
248 # everything else
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
249 self.write(cgitb.html())
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
250
1372
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
251 def clean_sessions(self):
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
252 '''age sessions, remove when they haven't been used for a week.
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
253 Do it only once an hour'''
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
254 sessions = self.db.sessions
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
255 last_clean = sessions.get('last_clean', 'last_use') or 0
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
256
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
257 week = 60*60*24*7
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
258 hour = 60*60
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
259 now = time.time()
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
260 if now - last_clean > hour:
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
261 # remove age sessions
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
262 for sessid in sessions.list():
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
263 interval = now - sessions.get(sessid, 'last_use')
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
264 if interval > week:
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
265 sessions.destroy(sessid)
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
266 sessions.set('last_clean', last_use=time.time())
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
267
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
268 def determine_user(self):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
269 ''' Determine who the user is
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
270 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
271 # determine the uid to use
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
272 self.opendb('admin')
1372
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
273 # clean age sessions
3931614b1cce cleaning old unused sessions only once per hour, not on every cgi request
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1358
diff changeset
274 self.clean_sessions()
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
275 # make sure we have the session Class
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
276 sessions = self.db.sessions
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
277
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
278 # look up the user session cookie
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
279 cookie = Cookie.SimpleCookie(self.env.get('HTTP_COOKIE', ''))
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
280 user = 'anonymous'
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
281
1018
b0527d9c8e11 call the cookie something else since it changed
Richard Jones <richard@users.sourceforge.net>
parents: 1016
diff changeset
282 # bump the "revision" of the cookie since the format changed
1414
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
283 if (cookie.has_key(self.cookie_name) and
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
284 cookie[self.cookie_name].value != 'deleted'):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
285
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
286 # get the session key from the cookie
1414
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
287 self.session = cookie[self.cookie_name].value
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
288 # get the user from the session
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
289 try:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
290 # update the lifetime datestamp
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
291 sessions.set(self.session, last_use=time.time())
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
292 sessions.commit()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
293 user = sessions.get(self.session, 'user')
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
294 except KeyError:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
295 user = 'anonymous'
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
296
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
297 # sanity check on the user still being valid, getting the userid
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
298 # at the same time
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
299 try:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
300 self.userid = self.db.user.lookup(user)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
301 except (KeyError, TypeError):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
302 user = 'anonymous'
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
303
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
304 # make sure the anonymous user is valid if we're using it
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
305 if user == 'anonymous':
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
306 self.make_user_anonymous()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
307 else:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
308 self.user = user
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
309
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
310 # reopen the database as the correct user
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
311 self.opendb(self.user)
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
312
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
313 def determine_context(self, dre=re.compile(r'([^\d]+)(\d+)')):
1053
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
314 ''' Determine the context of this page from the URL:
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
315
1053
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
316 The URL path after the instance identifier is examined. The path
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
317 is generally only one entry long.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
318
1053
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
319 - if there is no path, then we are in the "home" context.
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
320 * if the path is "_file", then the additional path entry
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
321 specifies the filename of a static file we're to serve up
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
322 from the instance "html" directory. Raises a SendStaticFile
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
323 exception.
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
324 - if there is something in the path (eg "issue"), it identifies
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
325 the tracker class we're to display.
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
326 - if the path is an item designator (eg "issue123"), then we're
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
327 to display a specific item.
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
328 * if the path starts with an item designator and is longer than
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
329 one entry, then we're assumed to be handling an item of a
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
330 FileClass, and the extra path information gives the filename
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
331 that the client is going to label the download with (ie
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
332 "file123/image.png" is nicer to download than "file123"). This
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
333 raises a SendFile exception.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
334
1053
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
335 Both of the "*" types of contexts stop before we bother to
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
336 determine the template we're going to use. That's because they
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
337 don't actually use templates.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
338
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
339 The template used is specified by the :template CGI variable,
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
340 which defaults to:
1053
b28393def972 more explanatory docsting
Richard Jones <richard@users.sourceforge.net>
parents: 1051
diff changeset
341
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
342 only classname suplied: "index"
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
343 full item designator supplied: "item"
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
344
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
345 We set:
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
346 self.classname - the class to display, can be None
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
347 self.template - the template to render the current context with
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
348 self.nodeid - the nodeid of the class we're displaying
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
349 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
350 # default the optional variables
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
351 self.classname = None
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
352 self.nodeid = None
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
353
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
354 # see if a template or messages are specified
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
355 template_override = ok_message = error_message = None
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
356 for key in self.form.keys():
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
357 if self.FV_TEMPLATE.match(key):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
358 template_override = self.form[key].value
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
359 elif self.FV_OK_MESSAGE.match(key):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
360 ok_message = self.form[key].value
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
361 elif self.FV_ERROR_MESSAGE.match(key):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
362 error_message = self.form[key].value
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
363
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
364 # determine the classname and possibly nodeid
1157
26c8cb2162d7 fixed various URL / base URL issues
Richard Jones <richard@users.sourceforge.net>
parents: 1153
diff changeset
365 path = self.path.split('/')
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
366 if not path or path[0] in ('', 'home', 'index'):
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
367 if template_override is not None:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
368 self.template = template_override
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
369 else:
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
370 self.template = ''
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
371 return
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
372 elif path[0] == '_file':
1427
37e712e77a99 trackers' templates directory can contain subdirectories with static files
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1426
diff changeset
373 raise SendStaticFile, os.path.join(*path[1:])
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
374 else:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
375 self.classname = path[0]
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
376 if len(path) > 1:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
377 # send the file identified by the designator in path[0]
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
378 raise SendFile, path[0]
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
379
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
380 # see if we got a designator
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
381 m = dre.match(self.classname)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
382 if m:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
383 self.classname = m.group(1)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
384 self.nodeid = m.group(2)
1153
0455eccad866 raise not found earlier, where it makes more sense to the user
Richard Jones <richard@users.sourceforge.net>
parents: 1152
diff changeset
385 if not self.db.getclass(self.classname).hasnode(self.nodeid):
0455eccad866 raise not found earlier, where it makes more sense to the user
Richard Jones <richard@users.sourceforge.net>
parents: 1152
diff changeset
386 raise NotFound, '%s/%s'%(self.classname, self.nodeid)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
387 # with a designator, we default to item view
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
388 self.template = 'item'
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
389 else:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
390 # with only a class, we default to index view
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
391 self.template = 'index'
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
392
1288
ad8de51d7cd5 handle "classname" URL path errors cleaner (generate a 404)
Richard Jones <richard@users.sourceforge.net>
parents: 1277
diff changeset
393 # make sure the classname is valid
ad8de51d7cd5 handle "classname" URL path errors cleaner (generate a 404)
Richard Jones <richard@users.sourceforge.net>
parents: 1277
diff changeset
394 try:
ad8de51d7cd5 handle "classname" URL path errors cleaner (generate a 404)
Richard Jones <richard@users.sourceforge.net>
parents: 1277
diff changeset
395 self.db.getclass(self.classname)
ad8de51d7cd5 handle "classname" URL path errors cleaner (generate a 404)
Richard Jones <richard@users.sourceforge.net>
parents: 1277
diff changeset
396 except KeyError:
ad8de51d7cd5 handle "classname" URL path errors cleaner (generate a 404)
Richard Jones <richard@users.sourceforge.net>
parents: 1277
diff changeset
397 raise NotFound, self.classname
ad8de51d7cd5 handle "classname" URL path errors cleaner (generate a 404)
Richard Jones <richard@users.sourceforge.net>
parents: 1277
diff changeset
398
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
399 # see if we have a template override
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
400 if template_override is not None:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
401 self.template = template_override
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
402
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
403 # see if we were passed in a message
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
404 if ok_message:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
405 self.ok_message.append(ok_message)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
406 if error_message:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
407 self.error_message.append(error_message)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
408
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
409 def serve_file(self, designator, dre=re.compile(r'([^\d]+)(\d+)')):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
410 ''' Serve the file from the content property of the designated item.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
411 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
412 m = dre.match(str(designator))
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
413 if not m:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
414 raise NotFound, str(designator)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
415 classname, nodeid = m.group(1), m.group(2)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
416 if classname != 'file':
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
417 raise NotFound, designator
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
418
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
419 # we just want to serve up the file named
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
420 file = self.db.file
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
421 self.additional_headers['Content-Type'] = file.get(nodeid, 'type')
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
422 self.write(file.get(nodeid, 'content'))
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
423
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
424 def serve_static_file(self, file):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
425 # we just want to serve up the file named
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
426 mt = mimetypes.guess_type(str(file))[0]
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
427 self.additional_headers['Content-Type'] = mt
1085
04a6b3bfbf23 instance_config -> config, and other related cleanups
Richard Jones <richard@users.sourceforge.net>
parents: 1084
diff changeset
428 self.write(open(os.path.join(self.instance.config.TEMPLATES,
04a6b3bfbf23 instance_config -> config, and other related cleanups
Richard Jones <richard@users.sourceforge.net>
parents: 1084
diff changeset
429 file)).read())
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
430
1204
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
431 def renderContext(self):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
432 ''' Return a PageTemplate for the named page
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
433 '''
1204
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
434 name = self.classname
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
435 extension = self.template
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
436 pt = Templates(self.instance.config.TEMPLATES).get(name, extension)
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
437
1103
db787cef1385 handled some XXXs
Richard Jones <richard@users.sourceforge.net>
parents: 1096
diff changeset
438 # catch errors so we can handle PT rendering errors more nicely
1204
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
439 args = {
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
440 'ok_message': self.ok_message,
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
441 'error_message': self.error_message
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
442 }
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
443 try:
1016
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
444 # let the template render figure stuff out
1204
b862bbf2067a Replaced the content() callback ickiness with Page Template macro usage
Richard Jones <richard@users.sourceforge.net>
parents: 1196
diff changeset
445 return pt.render(self, None, None, **args)
1068
665730c27d29 nicer template absence error
Richard Jones <richard@users.sourceforge.net>
parents: 1065
diff changeset
446 except NoTemplate, message:
665730c27d29 nicer template absence error
Richard Jones <richard@users.sourceforge.net>
parents: 1065
diff changeset
447 return '<strong>%s</strong>'%message
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
448 except:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
449 # everything else
1065
0f9aa62917bd much nicer error messages when there's a templating error
Richard Jones <richard@users.sourceforge.net>
parents: 1064
diff changeset
450 return cgitb.pt_html()
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
451
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
452 # these are the actions that are available
1151
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
453 actions = (
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
454 ('edit', 'editItemAction'),
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
455 ('editCSV', 'editCSVAction'),
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
456 ('new', 'newItemAction'),
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
457 ('register', 'registerAction'),
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
458 ('confrego', 'confRegoAction'),
1151
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
459 ('login', 'loginAction'),
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
460 ('logout', 'logout_action'),
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
461 ('search', 'searchAction'),
1277
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
462 ('retire', 'retireAction'),
1407
f7c24fd93dfe added a form to show a specific issue
Richard Jones <richard@users.sourceforge.net>
parents: 1402
diff changeset
463 ('show', 'showAction'),
1151
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
464 )
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
465 def handle_action(self):
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
466 ''' Determine whether there should be an Action called.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
467
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
468 The action is defined by the form variable :action which
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
469 identifies the method on this object to call. The four basic
1151
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
470 actions are defined in the "actions" sequence on this class:
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
471 "edit" -> self.editItemAction
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
472 "new" -> self.newItemAction
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
473 "register" -> self.registerAction
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
474 "confrego" -> self.confRegoAction
1064
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
475 "login" -> self.loginAction
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
476 "logout" -> self.logout_action
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
477 "search" -> self.searchAction
1277
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
478 "retire" -> self.retireAction
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
479 '''
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
480 if self.form.has_key(':action'):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
481 action = self.form[':action'].value.lower()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
482 elif self.form.has_key('@action'):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
483 action = self.form['@action'].value.lower()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
484 else:
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
485 return None
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
486 try:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
487 # get the action, validate it
1152
4cc99267bd23 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents: 1151
diff changeset
488 for name, method in self.actions:
1151
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
489 if name == action:
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
490 break
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
491 else:
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
492 raise ValueError, 'No such action "%s"'%action
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
493 # call the mapped action
1151
7e0024954954 making it easier to add new actions, and more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1144
diff changeset
494 getattr(self, method)()
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
495 except Redirect:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
496 raise
1064
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
497 except Unauthorised:
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
498 raise
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
499
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
500 def write(self, content):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
501 if not self.headers_done:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
502 self.header()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
503 self.request.wfile.write(content)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
504
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
505 def header(self, headers=None, response=None):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
506 '''Put up the appropriate header.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
507 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
508 if headers is None:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
509 headers = {'Content-Type':'text/html'}
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
510 if response is None:
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
511 response = self.response_code
1130
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
512
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
513 # update with additional info
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
514 headers.update(self.additional_headers)
1130
89bd02ffe4af tell clients/caches not to cache our dynamic bits
Richard Jones <richard@users.sourceforge.net>
parents: 1129
diff changeset
515
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
516 if not headers.has_key('Content-Type'):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
517 headers['Content-Type'] = 'text/html'
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
518 self.request.send_response(response)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
519 for entry in headers.items():
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
520 self.request.send_header(*entry)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
521 self.request.end_headers()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
522 self.headers_done = 1
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
523 if self.debug:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
524 self.headers_sent = headers
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
525
1235
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
526 def set_cookie(self, user):
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
527 ''' Set up a session cookie for the user and store away the user's
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
528 login info against the session.
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
529 '''
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
530 # TODO generate a much, much stronger session key ;)
1076
72d622b9bffd *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents: 1073
diff changeset
531 self.session = binascii.b2a_base64(repr(random.random())).strip()
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
532
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
533 # clean up the base64
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
534 if self.session[-1] == '=':
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
535 if self.session[-2] == '=':
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
536 self.session = self.session[:-2]
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
537 else:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
538 self.session = self.session[:-1]
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
539
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
540 # insert the session in the sessiondb
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
541 self.db.sessions.set(self.session, user=user, last_use=time.time())
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
542
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
543 # and commit immediately
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
544 self.db.sessions.commit()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
545
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
546 # expire us in a long, long time
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
547 expire = Cookie._getdate(86400*365)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
548
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
549 # generate the cookie path - make sure it has a trailing '/'
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
550 self.additional_headers['Set-Cookie'] = \
1414
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
551 '%s=%s; expires=%s; Path=%s;'%(self.cookie_name, self.session,
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
552 expire, self.cookie_path)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
553
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
554 def make_user_anonymous(self):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
555 ''' Make us anonymous
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
556
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
557 This method used to handle non-existence of the 'anonymous'
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
558 user, but that user is mandatory now.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
559 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
560 self.userid = self.db.user.lookup('anonymous')
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
561 self.user = 'anonymous'
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
562
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
563 def opendb(self, user):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
564 ''' Open the database.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
565 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
566 # open the db if the user has changed
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
567 if not hasattr(self, 'db') or user != self.db.journaltag:
1167
75e5f2055ca9 missed a db close
Richard Jones <richard@users.sourceforge.net>
parents: 1161
diff changeset
568 if hasattr(self, 'db'):
75e5f2055ca9 missed a db close
Richard Jones <richard@users.sourceforge.net>
parents: 1161
diff changeset
569 self.db.close()
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
570 self.db = self.instance.open(user)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
571
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
572 #
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
573 # Actions
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
574 #
1064
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
575 def loginAction(self):
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
576 ''' Attempt to log a user in.
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
577
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
578 Sets up a session for the user which contains the login
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
579 credentials.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
580 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
581 # we need the username at a minimum
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
582 if not self.form.has_key('__login_name'):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
583 self.error_message.append(_('Username required'))
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
584 return
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
585
1236
dd52bf10f934 Bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents: 1235
diff changeset
586 # get the login info
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
587 self.user = self.form['__login_name'].value
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
588 if self.form.has_key('__login_password'):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
589 password = self.form['__login_password'].value
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
590 else:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
591 password = ''
1236
dd52bf10f934 Bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents: 1235
diff changeset
592
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
593 # make sure the user exists
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
594 try:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
595 self.userid = self.db.user.lookup(self.user)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
596 except KeyError:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
597 name = self.user
1236
dd52bf10f934 Bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents: 1235
diff changeset
598 self.error_message.append(_('No such user "%(name)s"')%locals())
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
599 self.make_user_anonymous()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
600 return
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
601
1236
dd52bf10f934 Bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents: 1235
diff changeset
602 # verify the password
1235
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
603 if not self.verifyPassword(self.userid, password):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
604 self.make_user_anonymous()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
605 self.error_message.append(_('Incorrect password'))
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
606 return
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
607
1064
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
608 # make sure we're allowed to be here
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
609 if not self.loginPermission():
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
610 self.make_user_anonymous()
1252
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
611 self.error_message.append(_("You do not have permission to login"))
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
612 return
1058
a55ef5a98fd3 more docco... and we need to check for web access Permission!
Richard Jones <richard@users.sourceforge.net>
parents: 1056
diff changeset
613
1236
dd52bf10f934 Bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents: 1235
diff changeset
614 # now we're OK, re-open the database for real, using the user
dd52bf10f934 Bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents: 1235
diff changeset
615 self.opendb(self.user)
dd52bf10f934 Bug fixes.
Richard Jones <richard@users.sourceforge.net>
parents: 1235
diff changeset
616
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
617 # set the session cookie
1235
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
618 self.set_cookie(self.user)
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
619
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
620 def verifyPassword(self, userid, password):
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
621 ''' Verify the password that the user has supplied
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
622 '''
1252
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
623 stored = self.db.user.get(self.userid, 'password')
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
624 if password == stored:
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
625 return 1
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
626 if not password and not stored:
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
627 return 1
209a47ede743 allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents: 1249
diff changeset
628 return 0
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
629
1064
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
630 def loginPermission(self):
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
631 ''' Determine whether the user has permission to log in.
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
632
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
633 Base behaviour is to check the user has "Web Access".
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
634 '''
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
635 if not self.db.security.hasPermission('Web Access', self.userid):
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
636 return 0
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
637 return 1
fca22f820f87 enforce login permission, fix to :required checking
Richard Jones <richard@users.sourceforge.net>
parents: 1058
diff changeset
638
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
639 def logout_action(self):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
640 ''' Make us really anonymous - nuke the cookie too
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
641 '''
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
642 # log us out
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
643 self.make_user_anonymous()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
644
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
645 # construct the logout cookie
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
646 now = Cookie._getdate()
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
647 self.additional_headers['Set-Cookie'] = \
1414
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
648 '%s=deleted; Max-Age=0; expires=%s; Path=%s;'%(self.cookie_name,
b4630d078c08 another attempt to fix cookie misbehaviour
Richard Jones <richard@users.sourceforge.net>
parents: 1409
diff changeset
649 now, self.cookie_path)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
650
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
651 # Let the user know what's going on
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
652 self.ok_message.append(_('You are logged out'))
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
653
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
654 chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
655 def registerAction(self):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
656 '''Attempt to create a new user based on the contents of the form
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
657 and then set the cookie.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
658
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
659 return 1 on successful login
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
660 '''
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
661 # parse the props from the form
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
662 try:
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
663 props = self.parsePropsFromForm()[0][('user', None)]
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
664 except (ValueError, KeyError), message:
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
665 self.error_message.append(_('Error: ') + str(message))
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
666 return
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
667
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
668 # make sure we're allowed to register
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
669 if not self.registerPermission(props):
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
670 raise Unauthorised, _("You do not have permission to register")
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
671
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
672 try:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
673 self.db.user.lookup(props['username'])
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
674 self.error_message.append('Error: A user with the username "%s" '
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
675 'already exists'%props['username'])
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
676 return
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
677 except KeyError:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
678 pass
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
679
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
680 # generate the one-time-key and store the props for later
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
681 otk = ''.join([random.choice(self.chars) for x in range(32)])
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
682 for propname, proptype in self.db.user.getprops().items():
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
683 value = props.get(propname, None)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
684 if value is None:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
685 pass
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
686 elif isinstance(proptype, hyperdb.Date):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
687 props[propname] = str(value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
688 elif isinstance(proptype, hyperdb.Interval):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
689 props[propname] = str(value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
690 elif isinstance(proptype, hyperdb.Password):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
691 props[propname] = str(value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
692 self.db.otks.set(otk, **props)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
693
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
694 # send email to the user's email address
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
695 message = StringIO.StringIO()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
696 writer = MimeWriter.MimeWriter(message)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
697 tracker_name = self.db.config.TRACKER_NAME
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
698 s = 'Complete your registration to %s'%tracker_name
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
699 writer.addheader('Subject', encode_header(s))
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
700 writer.addheader('To', props['address'])
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
701 writer.addheader('From', roundupdb.straddr((tracker_name,
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
702 self.db.config.ADMIN_EMAIL)))
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
703 writer.addheader('Date', time.strftime("%a, %d %b %Y %H:%M:%S +0000",
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
704 time.gmtime()))
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
705 # add a uniquely Roundup header to help filtering
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
706 writer.addheader('X-Roundup-Name', tracker_name)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
707 # avoid email loops
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
708 writer.addheader('X-Roundup-Loop', 'hello')
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
709 writer.addheader('Content-Transfer-Encoding', 'quoted-printable')
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
710 body = writer.startbody('text/plain; charset=utf-8')
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
711
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
712 # message body, encoded quoted-printable
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
713 content = StringIO.StringIO('''
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
714 To complete your registration of the user "%(name)s" with %(tracker)s,
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
715 please visit the following URL:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
716
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
717 http://localhost:8001/test/?@action=confrego&otk=%(otk)s
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
718 '''%{'name': props['username'], 'tracker': tracker_name, 'url': self.base,
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
719 'otk': otk})
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
720 quopri.encode(content, body, 0)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
721
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
722 # now try to send the message
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
723 try:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
724 # send the message as admin so bounces are sent there
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
725 # instead of to roundup
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
726 smtp = smtplib.SMTP(self.db.config.MAILHOST)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
727 smtp.sendmail(self.db.config.ADMIN_EMAIL, [props['address']],
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
728 message.getvalue())
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
729 except socket.error, value:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
730 self.error_message.append("Error: couldn't send "
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
731 "confirmation email: mailhost %s"%value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
732 return
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
733 except smtplib.SMTPException, value:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
734 self.error_message.append("Error: couldn't send "
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
735 "confirmation email: %s"%value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
736 return
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
737
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
738 # commit changes to the database
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
739 self.db.commit()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
740
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
741 # redirect to the "you're almost there" page
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
742 raise Redirect, '%s?:template=rego_step1_done'%self.base
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
743
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
744 def registerPermission(self, props):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
745 ''' Determine whether the user has permission to register
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
746
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
747 Base behaviour is to check the user has "Web Registration".
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
748 '''
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
749 # registration isn't allowed to supply roles
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
750 if props.has_key('roles'):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
751 return 0
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
752 if self.db.security.hasPermission('Web Registration', self.userid):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
753 return 1
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
754 return 0
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
755
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
756 def confRegoAction(self):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
757 ''' Grab the OTK, use it to load up the new user details
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
758 '''
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
759 # pull the rego information out of the otk database
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
760 otk = self.form['otk'].value
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
761 props = self.db.otks.getall(otk)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
762 for propname, proptype in self.db.user.getprops().items():
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
763 value = props.get(propname, None)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
764 if value is None:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
765 pass
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
766 elif isinstance(proptype, hyperdb.Date):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
767 props[propname] = date.Date(value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
768 elif isinstance(proptype, hyperdb.Interval):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
769 props[propname] = date.Interval(value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
770 elif isinstance(proptype, hyperdb.Password):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
771 props[propname] = password.Password()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
772 props[propname].unpack(value)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
773
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
774 # re-open the database as "admin"
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
775 if self.user != 'admin':
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
776 self.opendb('admin')
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
777
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
778 # create the new user
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
779 cl = self.db.user
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
780 # XXX we need to make the "default" page be able to display errors!
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
781 # try:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
782 if 1:
1085
04a6b3bfbf23 instance_config -> config, and other related cleanups
Richard Jones <richard@users.sourceforge.net>
parents: 1084
diff changeset
783 props['roles'] = self.instance.config.NEW_WEB_USER_ROLES
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
784 self.userid = cl.create(**props)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
785 # clear the props from the otk database
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
786 self.db.otks.destroy(otk)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
787 self.db.commit()
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
788 # except (ValueError, KeyError), message:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
789 # self.error_message.append(str(message))
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
790 # return
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
791
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
792 # log the new user in
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
793 self.user = cl.get(self.userid, 'username')
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
794 # re-open the database for real, using the user
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
795 self.opendb(self.user)
1235
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
796
1249
6c24a86a12ae Fixes for SourceForge tracker bugs.
Richard Jones <richard@users.sourceforge.net>
parents: 1244
diff changeset
797 # if we have a session, update it
6c24a86a12ae Fixes for SourceForge tracker bugs.
Richard Jones <richard@users.sourceforge.net>
parents: 1244
diff changeset
798 if hasattr(self, 'session'):
1235
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
799 self.db.sessions.set(self.session, user=self.user,
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
800 last_use=time.time())
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
801 else:
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
802 # new session cookie
7441653e5330 added hook for external password validation, and some more docco
Richard Jones <richard@users.sourceforge.net>
parents: 1225
diff changeset
803 self.set_cookie(self.user)
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
804
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
805 # nice message
1120
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
806 message = _('You are now registered, welcome!')
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
807
c26471971d18 Exposed the Batch mechanism through the top-level "utils" variable.
Richard Jones <richard@users.sourceforge.net>
parents: 1103
diff changeset
808 # redirect to the item's edit page
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
809 raise Redirect, '%suser%s?@ok_message=%s'%(
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
810 self.base, self.userid, urllib.quote(message))
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
811
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
812 def editItemAction(self):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
813 ''' Perform an edit of an item in the database.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
814
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
815 See parsePropsFromForm and _editnodes for special variables
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
816 '''
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
817 # parse the props from the form
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
818 # XXX reinstate exception handling
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
819 # try:
1437
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
820 if 1:
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
821 props, links = self.parsePropsFromForm()
1437
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
822 # except (ValueError, KeyError), message:
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
823 # self.error_message.append(_('Error: ') + str(message))
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
824 # return
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
825
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
826 # handle the props
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
827 # XXX reinstate exception handling
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
828 # try:
1437
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
829 if 1:
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
830 message = self._editnodes(props, links)
1437
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
831 # except (ValueError, KeyError, IndexError), message:
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
832 # self.error_message.append(_('Error: ') + str(message))
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
833 # return
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
834
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
835 # commit now that all the tricky stuff is done
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
836 self.db.commit()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
837
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
838 # redirect to the item's edit page
1437
077235194ac2 oops, missed a +
Richard Jones <richard@users.sourceforge.net>
parents: 1436
diff changeset
839 raise Redirect, '%s%s%s?@ok_message=%s'%(self.base, self.classname,
1002
1798d2fa9fec Hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 985
diff changeset
840 self.nodeid, urllib.quote(message))
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
841
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
842 def editItemPermission(self, props):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
843 ''' Determine whether the user has permission to edit this item.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
844
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
845 Base behaviour is to check the user can edit this class. If we're
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
846 editing the "user" class, users are allowed to edit their own
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
847 details. Unless it's the "roles" property, which requires the
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
848 special Permission "Web Roles".
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
849 '''
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
850 # if this is a user node and the user is editing their own node, then
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
851 # we're OK
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
852 has = self.db.security.hasPermission
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
853 if self.classname == 'user':
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
854 # reject if someone's trying to edit "roles" and doesn't have the
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
855 # right permission.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
856 if props.has_key('roles') and not has('Web Roles', self.userid,
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
857 'user'):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
858 return 0
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
859 # if the item being edited is the current user, we're ok
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
860 if self.nodeid == self.userid:
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
861 return 1
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
862 if self.db.security.hasPermission('Edit', self.userid, self.classname):
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
863 return 1
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
864 return 0
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
865
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
866 def newItemAction(self):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
867 ''' Add a new item to the database.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
868
1055
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
869 This follows the same form as the editItemAction, with the same
cf72eae57a2c Fixed instance installation
Richard Jones <richard@users.sourceforge.net>
parents: 1054
diff changeset
870 special form values.
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
871 '''
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
872 # parse the props from the form
1436
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
873 # XXX reinstate exception handling
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
874 # try:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
875 if 1:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
876 props, links = self.parsePropsFromForm()
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
877 # except (ValueError, KeyError), message:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
878 # self.error_message.append(_('Error: ') + str(message))
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
879 # return
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
880
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
881 # handle the props - edit or create
1436
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
882 # XXX reinstate exception handling
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
883 # try:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
884 if 1:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
885 # create the context here
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
886 # cn = self.classname
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
887 # nid = self._createnode(cn, props[(cn, None)])
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
888 # del props[(cn, None)]
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
889
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
890 # when it hits the None element, it'll set self.nodeid
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
891 messages = self._editnodes(props, links) #, {(cn, None): nid})
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
892
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
893 # except (ValueError, KeyError, IndexError), message:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
894 # # these errors might just be indicative of user dumbness
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
895 # self.error_message.append(_('Error: ') + str(message))
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
896 # return
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
897
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
898 # commit now that all the tricky stuff is done
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
899 self.db.commit()
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
900
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
901 # redirect to the new item's page
1436
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
902 raise Redirect, '%s%s%s?@ok_message=%s'%(self.base, self.classname,
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
903 self.nodeid, urllib.quote(messages))
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
904
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
905 def newItemPermission(self, props):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
906 ''' Determine whether the user has permission to create (edit) this
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
907 item.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
908
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
909 Base behaviour is to check the user can edit this class. No
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
910 additional property checks are made. Additionally, new user items
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
911 may be created if the user has the "Web Registration" Permission.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
912 '''
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
913 has = self.db.security.hasPermission
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
914 if self.classname == 'user' and has('Web Registration', self.userid,
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
915 'user'):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
916 return 1
1005
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
917 if has('Edit', self.userid, self.classname):
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
918 return 1
efa19bdad6c3 reinstated registration, cleaned up PT compile error reporting
Richard Jones <richard@users.sourceforge.net>
parents: 1004
diff changeset
919 return 0
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
920
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
921
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
922 #
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
923 # Utility methods for editing
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
924 #
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
925 def _editnodes(self, all_props, all_links, newids=None):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
926 ''' Use the props in all_props to perform edit and creation, then
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
927 use the link specs in all_links to do linking.
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
928 '''
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
929 # figure dependencies and re-work links
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
930 deps = {}
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
931 links = {}
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
932 for cn, nodeid, propname, vlist in all_links:
1445
0bbc8be96592 handle links to nonexisting items better
Richard Jones <richard@users.sourceforge.net>
parents: 1444
diff changeset
933 if not all_props.has_key((cn, nodeid)):
0bbc8be96592 handle links to nonexisting items better
Richard Jones <richard@users.sourceforge.net>
parents: 1444
diff changeset
934 # link item to link to doesn't (and won't) exist
0bbc8be96592 handle links to nonexisting items better
Richard Jones <richard@users.sourceforge.net>
parents: 1444
diff changeset
935 continue
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
936 for value in vlist:
1445
0bbc8be96592 handle links to nonexisting items better
Richard Jones <richard@users.sourceforge.net>
parents: 1444
diff changeset
937 if not all_props.has_key(value):
0bbc8be96592 handle links to nonexisting items better
Richard Jones <richard@users.sourceforge.net>
parents: 1444
diff changeset
938 # link item to link to doesn't (and won't) exist
0bbc8be96592 handle links to nonexisting items better
Richard Jones <richard@users.sourceforge.net>
parents: 1444
diff changeset
939 continue
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
940 deps.setdefault((cn, nodeid), []).append(value)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
941 links.setdefault(value, []).append((cn, nodeid, propname))
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
942
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
943 # figure chained dependencies ordering
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
944 order = []
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
945 done = {}
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
946 # loop detection
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
947 change = 0
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
948 while len(all_props) != len(done):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
949 for needed in all_props.keys():
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
950 if done.has_key(needed):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
951 continue
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
952 tlist = deps.get(needed, [])
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
953 for target in tlist:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
954 if not done.has_key(target):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
955 break
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
956 else:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
957 done[needed] = 1
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
958 order.append(needed)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
959 change = 1
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
960 if not change:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
961 raise ValueError, 'linking must not loop!'
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
962
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
963 # now, edit / create
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
964 m = []
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
965 for needed in order:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
966 props = all_props[needed]
1446
8ce33ce262a4 fix property type check, and dont create items that have no properties
Richard Jones <richard@users.sourceforge.net>
parents: 1445
diff changeset
967 if not props:
8ce33ce262a4 fix property type check, and dont create items that have no properties
Richard Jones <richard@users.sourceforge.net>
parents: 1445
diff changeset
968 # nothing to do
8ce33ce262a4 fix property type check, and dont create items that have no properties
Richard Jones <richard@users.sourceforge.net>
parents: 1445
diff changeset
969 continue
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
970 cn, nodeid = needed
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
971
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
972 if nodeid is not None and int(nodeid) > 0:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
973 # make changes to the node
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
974 props = self._changenode(cn, nodeid, props)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
975
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
976 # and some nice feedback for the user
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
977 if props:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
978 info = ', '.join(props.keys())
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
979 m.append('%s %s %s edited ok'%(cn, nodeid, info))
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
980 else:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
981 m.append('%s %s - nothing changed'%(cn, nodeid))
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
982 else:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
983 assert props
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
984
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
985 # make a new node
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
986 newid = self._createnode(cn, props)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
987 if nodeid is None:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
988 self.nodeid = newid
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
989 nodeid = newid
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
990
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
991 # and some nice feedback for the user
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
992 m.append('%s %s created'%(cn, newid))
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
993
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
994 # fill in new ids in links
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
995 if links.has_key(needed):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
996 for linkcn, linkid, linkprop in links[needed]:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
997 props = all_props[(linkcn, linkid)]
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
998 cl = self.db.classes[linkcn]
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
999 propdef = cl.getprops()[linkprop]
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1000 if not props.has_key(linkprop):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1001 if linkid is None or linkid.startswith('-'):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1002 # linking to a new item
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1003 if isinstance(propdef, hyperdb.Multilink):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1004 props[linkprop] = [newid]
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1005 else:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1006 props[linkprop] = newid
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1007 else:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1008 # linking to an existing item
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1009 if isinstance(propdef, hyperdb.Multilink):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1010 existing = cl.get(linkid, linkprop)[:]
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1011 existing.append(nodeid)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1012 props[linkprop] = existing
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1013 else:
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1014 props[linkprop] = newid
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1015
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1016 return '<br>'.join(m)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1017
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1018 def _changenode(self, cn, nodeid, props):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1019 ''' change the node based on the contents of the form
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1020 '''
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1021 # check for permission
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1022 if not self.editItemPermission(props):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1023 raise PermissionError, 'You do not have permission to edit %s'%cn
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1024
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1025 # make the changes
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1026 cl = self.db.classes[cn]
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1027 return cl.set(nodeid, **props)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1028
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1029 def _createnode(self, cn, props):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1030 ''' create a node based on the contents of the form
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1031 '''
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1032 # check for permission
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1033 if not self.newItemPermission(props):
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1034 raise PermissionError, 'You do not have permission to create %s'%cn
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1035
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1036 # create the node and return its id
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1037 cl = self.db.classes[cn]
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1038 return cl.create(**props)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1039
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1040 #
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1041 # More actions
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1042 #
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1043 def editCSVAction(self):
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1044 ''' Performs an edit of all of a class' items in one go.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1045
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1046 The "rows" CGI var defines the CSV-formatted entries for the
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1047 class. New nodes are identified by the ID 'X' (or any other
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1048 non-existent ID) and removed lines are retired.
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1049 '''
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1050 # this is per-class only
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1051 if not self.editCSVPermission():
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1052 self.error_message.append(
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1053 _('You do not have permission to edit %s' %self.classname))
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1054
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1055 # get the CSV module
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1056 try:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1057 import csv
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1058 except ImportError:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1059 self.error_message.append(_(
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1060 'Sorry, you need the csv module to use this function.<br>\n'
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1061 'Get it from: <a href="http://www.object-craft.com.au/projects/csv/">http://www.object-craft.com.au/projects/csv/'))
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1062 return
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1063
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1064 cl = self.db.classes[self.classname]
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1065 idlessprops = cl.getprops(protected=0).keys()
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1066 idlessprops.sort()
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1067 props = ['id'] + idlessprops
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1068
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1069 # do the edit
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1070 rows = self.form['rows'].value.splitlines()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1071 p = csv.parser()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1072 found = {}
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1073 line = 0
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1074 for row in rows[1:]:
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1075 line += 1
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1076 values = p.parse(row)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1077 # not a complete row, keep going
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1078 if not values: continue
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1079
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1080 # skip property names header
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1081 if values == props:
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1082 continue
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1083
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1084 # extract the nodeid
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1085 nodeid, values = values[0], values[1:]
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1086 found[nodeid] = 1
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1087
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1088 # confirm correct weight
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1089 if len(idlessprops) != len(values):
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1090 self.error_message.append(
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1091 _('Not enough values on line %(line)s')%{'line':line})
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1092 return
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1093
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1094 # extract the new values
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1095 d = {}
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1096 for name, value in zip(idlessprops, values):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1097 value = value.strip()
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1098 # only add the property if it has a value
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1099 if value:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1100 # if it's a multilink, split it
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1101 if isinstance(cl.properties[name], hyperdb.Multilink):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1102 value = value.split(':')
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1103 d[name] = value
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1104
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1105 # perform the edit
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1106 if cl.hasnode(nodeid):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1107 # edit existing
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1108 cl.set(nodeid, **d)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1109 else:
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1110 # new node
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1111 found[cl.create(**d)] = 1
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1112
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1113 # retire the removed entries
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1114 for nodeid in cl.list():
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1115 if not found.has_key(nodeid):
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1116 cl.retire(nodeid)
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1117
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1118 # all OK
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1119 self.db.commit()
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1120
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1121 self.ok_message.append(_('Items edited OK'))
985
55ab0c5b49f9 New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1122
1041
c28603c9f831 Class help and generic class editing done.
Richard Jones <richard@users.sourceforge.net>
parents: 1029
diff changeset
1123 def editCSVPermission(self):
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1124 ''' Determine whether the user has permission to edit this class.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1125
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1126 Base behaviour is to check the user can edit this class.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1127 '''
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1128 if not self.db.security.hasPermission('Edit', self.userid,
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1129 self.classname):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1130 return 0
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1131 return 1
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1132
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1133 def searchAction(self):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1134 ''' Mangle some of the form variables.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1135
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1136 Set the form ":filter" variable based on the values of the
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1137 filter variables - if they're set to anything other than
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1138 "dontcare" then add them to :filter.
1016
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1139
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1140 Also handle the ":queryname" variable and save off the query to
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1141 the user's query list.
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1142 '''
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1143 # generic edit is per-class only
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1144 if not self.searchPermission():
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1145 self.error_message.append(
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1146 _('You do not have permission to search %s' %self.classname))
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1147
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1148 # add a faked :filter form variable for each filtering prop
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1149 props = self.db.classes[self.classname].getprops()
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1150 queryname = ''
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1151 for key in self.form.keys():
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1152 # special vars
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1153 if self.FV_QUERYNAME.match(key):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1154 queryname = self.form[key].value.strip()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1155 continue
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1156
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1157 if not props.has_key(key):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1158 continue
1409
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1159 if isinstance(self.form[key], type([])):
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1160 # search for at least one entry which is not empty
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1161 for minifield in self.form[key]:
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1162 if minifield.value:
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1163 break
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1164 else:
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1165 continue
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1166 else:
8dc60d87ab42 Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents: 1407
diff changeset
1167 if not self.form[key].value: continue
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1168 self.form.value.append(cgi.MiniFieldStorage('@filter', key))
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1169
1016
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1170 # handle saving the query params
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1171 if queryname:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1172 # parse the environment and figure what the query _is_
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1173 req = HTMLRequest(self)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1174 url = req.indexargs_href('', {})
1016
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1175
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1176 # handle editing an existing query
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1177 try:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1178 qid = self.db.query.lookup(queryname)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1179 self.db.query.set(qid, klass=self.classname, url=url)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1180 except KeyError:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1181 # create a query
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1182 qid = self.db.query.create(name=queryname,
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1183 klass=self.classname, url=url)
1016
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1184
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1185 # and add it to the user's query multilink
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1186 queries = self.db.user.get(self.userid, 'queries')
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1187 queries.append(qid)
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1188 self.db.user.set(self.userid, queries=queries)
1016
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1189
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1190 # commit the query change to the database
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1191 self.db.commit()
1016
d6c13142e7b9 Keep a cache of compiled PageTemplates.
Richard Jones <richard@users.sourceforge.net>
parents: 1008
diff changeset
1192
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1193 def searchPermission(self):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1194 ''' Determine whether the user has permission to search this class.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1195
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1196 Base behaviour is to check the user can view this class.
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1197 '''
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1198 if not self.db.security.hasPermission('View', self.userid,
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1199 self.classname):
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1200 return 0
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1201 return 1
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1202
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1203
1277
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1204 def retireAction(self):
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1205 ''' Retire the context item.
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1206 '''
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1207 # if we want to view the index template now, then unset the nodeid
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1208 # context info (a special-case for retire actions on the index page)
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1209 nodeid = self.nodeid
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1210 if self.template == 'index':
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1211 self.nodeid = None
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1212
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1213 # generic edit is per-class only
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1214 if not self.retirePermission():
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1215 self.error_message.append(
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1216 _('You do not have permission to retire %s' %self.classname))
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1217 return
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1218
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1219 # make sure we don't try to retire admin or anonymous
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1220 if self.classname == 'user' and \
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1221 self.db.user.get(nodeid, 'username') in ('admin', 'anonymous'):
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1222 self.error_message.append(
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1223 _('You may not retire the admin or anonymous user'))
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1224 return
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1225
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1226 # do the retire
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1227 self.db.getclass(self.classname).retire(nodeid)
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1228 self.db.commit()
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1229
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1230 self.ok_message.append(
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1231 _('%(classname)s %(itemid)s has been retired')%{
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1232 'classname': self.classname.capitalize(), 'itemid': nodeid})
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1233
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1234 def retirePermission(self):
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1235 ''' Determine whether the user has permission to retire this class.
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1236
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1237 Base behaviour is to check the user can edit this class.
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1238 '''
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1239 if not self.db.security.hasPermission('Edit', self.userid,
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1240 self.classname):
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1241 return 0
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1242 return 1
a9a3c378acc2 implemented "retire" cgi action, added to user index [SF#618612]
Richard Jones <richard@users.sourceforge.net>
parents: 1254
diff changeset
1243
1003
f89b8d32291b Hack hack hack...
Richard Jones <richard@users.sourceforge.net>
parents: 1002
diff changeset
1244
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1245 def showAction(self, typere=re.compile('[@:]type'),
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1246 numre=re.compile('[@:]number')):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1247 ''' Show a node of a particular class/id
1407
f7c24fd93dfe added a form to show a specific issue
Richard Jones <richard@users.sourceforge.net>
parents: 1402
diff changeset
1248 '''
1467
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1249 t = n = ''
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1250 for key in self.form.keys():
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1251 if typere.match(key):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1252 t = self.form[key].value.strip()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1253 elif numre.match(key):
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1254 n = self.form[key].value.strip()
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1255 if not t:
378081f066cc registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents: 1456
diff changeset
1256 raise ValueError, 'Invalid %s number'%t
1407
f7c24fd93dfe added a form to show a specific issue
Richard Jones <richard@users.sourceforge.net>
parents: 1402
diff changeset
1257 url = '%s%s%s'%(self.db.config.TRACKER_WEB, t, n)
f7c24fd93dfe added a form to show a specific issue
Richard Jones <richard@users.sourceforge.net>
parents: 1402
diff changeset
1258 raise Redirect, url
f7c24fd93dfe added a form to show a specific issue
Richard Jones <richard@users.sourceforge.net>
parents: 1402
diff changeset
1259
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1260 def parsePropsFromForm(self, num_re=re.compile('^\d+$')):
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1261 ''' Pull properties out of the form.
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1262
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1263 In the following, <bracketed> values are variable, ":" may be
1436
2f6647cf5345 bugger, dropping support for "+" special char
Richard Jones <richard@users.sourceforge.net>
parents: 1435
diff changeset
1264 one of ":" or "@", and other text "required" is fixed.
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1265
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1266 Properties are specified as form variables:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1267
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1268 <propname>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1269 - property on the current context item
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1270
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1271 <designator>:<propname>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1272 - property on the indicated item
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1273
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1274 <classname>-<N>:<propname>
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1275 - property on the Nth new item of classname
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1276
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1277 Once we have determined the "propname", we check to see if it
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1278 is one of the special form values:
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1279
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1280 :required
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1281 The named property values must be supplied or a ValueError
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1282 will be raised.
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1283
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1284 :remove:<propname>=id(s)
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1285 The ids will be removed from the multilink property.
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1286
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1287 :add:<propname>=id(s)
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1288 The ids will be added to the multilink property.
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1289
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1290 :link:<propname>=<designator>
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1291 Used to add a link to new items created during edit.
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1292 These are collected up and returned in all_links. This will
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1293 result in an additional linking operation (either Link set or
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1294 Multilink append) after the edit/create is done using
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1295 all_props in _editnodes. The <propname> on the current item
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1296 will be set/appended the id of the newly created item of
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1297 class <designator> (where <designator> must be
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1298 <classname>-<N>).
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1299
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1300 Any of the form variables may be prefixed with a classname or
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1301 designator.
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1302
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1303 The return from this method is a dict of
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1304 (classname, id): properties
1422
5599f1990325 more info in docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1421
diff changeset
1305 ... this dict _always_ has an entry for the current context,
5599f1990325 more info in docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1421
diff changeset
1306 even if it's empty (ie. a submission for an existing issue that
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1307 doesn't result in any changes would return {('issue','123'): {}})
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1308 The id may be None, which indicates that an item should be
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1309 created.
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1310
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1311 If a String property's form value is a file upload, then we
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1312 try to set additional properties "filename" and "type" (if
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1313 they are valid for the class).
1435
a866491d04a7 forgot :note/:file docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1431
diff changeset
1314
a866491d04a7 forgot :note/:file docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1431
diff changeset
1315 Two special form values are supported for backwards
a866491d04a7 forgot :note/:file docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1431
diff changeset
1316 compatibility:
a866491d04a7 forgot :note/:file docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1431
diff changeset
1317 :note - create a message (with content, author and date), link
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1318 to the context item. This is ALWAYS desginated "msg-1".
1435
a866491d04a7 forgot :note/:file docstring
Richard Jones <richard@users.sourceforge.net>
parents: 1431
diff changeset
1319 :file - create a file, attach to the current item and any
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1320 message created by :note. This is ALWAYS designated
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1321 "file-1".
1442
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1322
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1323 We also check that FileClass items have a "content" property with
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1324 actual content, otherwise we remove them from all_props before
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1325 returning.
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1326 '''
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1327 # some very useful variables
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1328 db = self.db
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1329 form = self.form
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1330
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1331 if not hasattr(self, 'FV_SPECIAL'):
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1332 # generate the regexp for handling special form values
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1333 classes = '|'.join(db.classes.keys())
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1334 # specials for parsePropsFromForm
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1335 # handle the various forms (see unit tests)
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1336 self.FV_SPECIAL = re.compile(self.FV_LABELS%classes, re.VERBOSE)
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1337 self.FV_DESIGNATOR = re.compile(r'(%s)([-\d]+)'%classes)
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1338
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1339 # these indicate the default class / item
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1340 default_cn = self.classname
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1341 default_cl = self.db.classes[default_cn]
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1342 default_nodeid = self.nodeid
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1343
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1344 # we'll store info about the individual class/item edit in these
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1345 all_required = {} # one entry per class/item
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1346 all_props = {} # one entry per class/item
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1347 all_propdef = {} # note - only one entry per class
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1348 all_links = [] # as many as are required
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1349
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1350 # we should always return something, even empty, for the context
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1351 all_props[(default_cn, default_nodeid)] = {}
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1352
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1353 keys = form.keys()
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1354 timezone = db.getUserTimezone()
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1355
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1356 # sentinels for the :note and :file props
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1357 have_note = have_file = 0
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1358
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1359 # extract the usable form labels from the form
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1360 matches = []
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1361 for key in keys:
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1362 m = self.FV_SPECIAL.match(key)
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1363 if m:
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1364 matches.append((key, m.groupdict()))
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1365
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1366 # now handle the matches
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1367 for key, d in matches:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1368 if d['classname']:
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1369 # we got a designator
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1370 cn = d['classname']
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1371 cl = self.db.classes[cn]
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1372 nodeid = d['id']
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1373 propname = d['propname']
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1374 elif d['note']:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1375 # the special note field
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1376 cn = 'msg'
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1377 cl = self.db.classes[cn]
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1378 nodeid = '-1'
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1379 propname = 'content'
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1380 all_links.append((default_cn, default_nodeid, 'messages',
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1381 [('msg', '-1')]))
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1382 have_note = 1
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1383 elif d['file']:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1384 # the special file field
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1385 cn = 'file'
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1386 cl = self.db.classes[cn]
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1387 nodeid = '-1'
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1388 propname = 'content'
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1389 all_links.append((default_cn, default_nodeid, 'files',
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1390 [('file', '-1')]))
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1391 have_file = 1
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1392 else:
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1393 # default
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1394 cn = default_cn
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1395 cl = default_cl
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1396 nodeid = default_nodeid
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1397 propname = d['propname']
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1398
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1399 # the thing this value relates to is...
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1400 this = (cn, nodeid)
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1401
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1402 # get more info about the class, and the current set of
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1403 # form props for it
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1404 if not all_propdef.has_key(cn):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1405 all_propdef[cn] = cl.getprops()
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1406 propdef = all_propdef[cn]
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1407 if not all_props.has_key(this):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1408 all_props[this] = {}
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1409 props = all_props[this]
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1410
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1411 # is this a link command?
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1412 if d['link']:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1413 value = []
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1414 for entry in extractFormList(form[key]):
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1415 m = self.FV_DESIGNATOR.match(entry)
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1416 if not m:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1417 raise ValueError, \
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1418 'link "%s" value "%s" not a designator'%(key, entry)
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1419 value.append((m.group(1), m.group(2)))
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1420
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1421 # make sure the link property is valid
1446
8ce33ce262a4 fix property type check, and dont create items that have no properties
Richard Jones <richard@users.sourceforge.net>
parents: 1445
diff changeset
1422 if (not isinstance(propdef[propname], hyperdb.Multilink) and
8ce33ce262a4 fix property type check, and dont create items that have no properties
Richard Jones <richard@users.sourceforge.net>
parents: 1445
diff changeset
1423 not isinstance(propdef[propname], hyperdb.Link)):
1444
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1424 raise ValueError, '%s %s is not a link or '\
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1425 'multilink property'%(cn, propname)
8c5a513e52c9 Form handling now performs all actions in one go.
Richard Jones <richard@users.sourceforge.net>
parents: 1443
diff changeset
1426
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1427 all_links.append((cn, nodeid, propname, value))
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1428 continue
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1429
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1430 # detect the special ":required" variable
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1431 if d['required']:
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1432 all_required[this] = extractFormList(form[key])
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1433 continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1434
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1435 # get the required values list
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1436 if not all_required.has_key(this):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1437 all_required[this] = []
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1438 required = all_required[this]
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1439
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1440 # see if we're performing a special multilink action
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1441 mlaction = 'set'
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1442 if d['remove']:
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1443 mlaction = 'remove'
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1444 elif d['add']:
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1445 mlaction = 'add'
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1446
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1447 # does the property exist?
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1448 if not propdef.has_key(propname):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1449 if mlaction != 'set':
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1450 raise ValueError, 'You have submitted a %s action for'\
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1451 ' the property "%s" which doesn\'t exist'%(mlaction,
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1452 propname)
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1453 # the form element is probably just something we don't care
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1454 # about - ignore it
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1455 continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1456 proptype = propdef[propname]
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1457
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1458 # Get the form value. This value may be a MiniFieldStorage or a list
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1459 # of MiniFieldStorages.
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1460 value = form[key]
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1461
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1462 # handle unpacking of the MiniFieldStorage / list form value
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1463 if isinstance(proptype, hyperdb.Multilink):
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1464 value = extractFormList(value)
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1465 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1466 # multiple values are not OK
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1467 if isinstance(value, type([])):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1468 raise ValueError, 'You have submitted more than one value'\
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1469 ' for the %s property'%propname
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1470 # value might be a file upload...
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1471 if not hasattr(value, 'filename') or value.filename is None:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1472 # nope, pull out the value and strip it
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1473 value = value.value.strip()
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1474
1426
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1475 # now that we have the props field, we need a teensy little
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1476 # extra bit of help for the old :note field...
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1477 if d['note'] and value:
1426
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1478 props['author'] = self.db.getuid()
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1479 props['date'] = date.Date()
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1480
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1481 # handle by type now
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1482 if isinstance(proptype, hyperdb.Password):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1483 if not value:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1484 # ignore empty password values
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1485 continue
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1486 for key, d in matches:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1487 if d['confirm'] and d['propname'] == propname:
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1488 confirm = form[key]
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1489 break
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1490 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1491 raise ValueError, 'Password and confirmation text do '\
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1492 'not match'
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1493 if isinstance(confirm, type([])):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1494 raise ValueError, 'You have submitted more than one value'\
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1495 ' for the %s property'%propname
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1496 if value != confirm.value:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1497 raise ValueError, 'Password and confirmation text do '\
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1498 'not match'
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1499 value = password.Password(value)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1500
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1501 elif isinstance(proptype, hyperdb.Link):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1502 # see if it's the "no selection" choice
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1503 if value == '-1' or not value:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1504 # if we're creating, just don't include this property
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1505 if not nodeid or nodeid.startswith('-'):
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1506 continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1507 value = None
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1508 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1509 # handle key values
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1510 link = proptype.classname
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1511 if not num_re.match(value):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1512 try:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1513 value = db.classes[link].lookup(value)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1514 except KeyError:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1515 raise ValueError, _('property "%(propname)s": '
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1516 '%(value)s not a %(classname)s')%{
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1517 'propname': propname, 'value': value,
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1518 'classname': link}
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1519 except TypeError, message:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1520 raise ValueError, _('you may only enter ID values '
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1521 'for property "%(propname)s": %(message)s')%{
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1522 'propname': propname, 'message': message}
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1523 elif isinstance(proptype, hyperdb.Multilink):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1524 # perform link class key value lookup if necessary
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1525 link = proptype.classname
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1526 link_cl = db.classes[link]
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1527 l = []
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1528 for entry in value:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1529 if not entry: continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1530 if not num_re.match(entry):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1531 try:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1532 entry = link_cl.lookup(entry)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1533 except KeyError:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1534 raise ValueError, _('property "%(propname)s": '
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1535 '"%(value)s" not an entry of %(classname)s')%{
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1536 'propname': propname, 'value': entry,
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1537 'classname': link}
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1538 except TypeError, message:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1539 raise ValueError, _('you may only enter ID values '
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1540 'for property "%(propname)s": %(message)s')%{
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1541 'propname': propname, 'message': message}
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1542 l.append(entry)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1543 l.sort()
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1544
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1545 # now use that list of ids to modify the multilink
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1546 if mlaction == 'set':
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1547 value = l
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1548 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1549 # we're modifying the list - get the current list of ids
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1550 if props.has_key(propname):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1551 existing = props[propname]
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1552 elif nodeid and not nodeid.startswith('-'):
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1553 existing = cl.get(nodeid, propname, [])
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1554 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1555 existing = []
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1556
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1557 # now either remove or add
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1558 if mlaction == 'remove':
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1559 # remove - handle situation where the id isn't in
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1560 # the list
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1561 for entry in l:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1562 try:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1563 existing.remove(entry)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1564 except ValueError:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1565 raise ValueError, _('property "%(propname)s": '
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1566 '"%(value)s" not currently in list')%{
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1567 'propname': propname, 'value': entry}
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1568 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1569 # add - easy, just don't dupe
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1570 for entry in l:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1571 if entry not in existing:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1572 existing.append(entry)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1573 value = existing
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1574 value.sort()
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1575
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1576 elif value == '':
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1577 # if we're creating, just don't include this property
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1578 if not nodeid or nodeid.startswith('-'):
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1579 continue
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1580 # other types should be None'd if there's no value
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1581 value = None
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1582 else:
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1583 if isinstance(proptype, hyperdb.String):
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1584 if (hasattr(value, 'filename') and
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1585 value.filename is not None):
1426
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1586 # skip if the upload is empty
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1587 if not value.filename:
b79b1823af7b more fixes for backward-compatibility form entries
Richard Jones <richard@users.sourceforge.net>
parents: 1425
diff changeset
1588 continue
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1589 # this String is actually a _file_
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1590 # try to determine the file content-type
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1591 filename = value.filename.split('\\')[-1]
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1592 if propdef.has_key('name'):
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1593 props['name'] = filename
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1594 # use this info as the type/filename properties
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1595 if propdef.has_key('type'):
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1596 props['type'] = mimetypes.guess_type(filename)[0]
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1597 if not props['type']:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1598 props['type'] = "application/octet-stream"
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1599 # finally, read the content
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1600 value = value.value
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1601 else:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1602 # normal String fix the CRLF/CR -> LF stuff
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1603 value = fixNewlines(value)
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1604
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1605 elif isinstance(proptype, hyperdb.Date):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1606 value = date.Date(value, offset=timezone)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1607 elif isinstance(proptype, hyperdb.Interval):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1608 value = date.Interval(value)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1609 elif isinstance(proptype, hyperdb.Boolean):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1610 value = value.lower() in ('yes', 'true', 'on', '1')
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1611 elif isinstance(proptype, hyperdb.Number):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1612 value = float(value)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1613
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1614 # get the old value
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1615 if nodeid and not nodeid.startswith('-'):
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1616 try:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1617 existing = cl.get(nodeid, propname)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1618 except KeyError:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1619 # this might be a new property for which there is
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1620 # no existing value
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1621 if not propdef.has_key(propname):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1622 raise
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1623
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1624 # make sure the existing multilink is sorted
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1625 if isinstance(proptype, hyperdb.Multilink):
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1626 existing.sort()
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1627
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1628 # "missing" existing values may not be None
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1629 if not existing:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1630 if isinstance(proptype, hyperdb.String) and not existing:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1631 # some backends store "missing" Strings as empty strings
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1632 existing = None
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1633 elif isinstance(proptype, hyperdb.Number) and not existing:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1634 # some backends store "missing" Numbers as 0 :(
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1635 existing = 0
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1636 elif isinstance(proptype, hyperdb.Boolean) and not existing:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1637 # likewise Booleans
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1638 existing = 0
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1639
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1640 # if changed, set it
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1641 if value != existing:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1642 props[propname] = value
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1643 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1644 # don't bother setting empty/unset values
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1645 if value is None:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1646 continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1647 elif isinstance(proptype, hyperdb.Multilink) and value == []:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1648 continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1649 elif isinstance(proptype, hyperdb.String) and value == '':
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1650 continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1651
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1652 props[propname] = value
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1653
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1654 # register this as received if required?
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1655 if propname in required and value is not None:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1656 required.remove(propname)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1657
1438
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1658 # check to see if we need to specially link a file to the note
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1659 if have_note and have_file:
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1660 all_links.append(('msg', '-1', 'files', [('file', '-1')]))
13c42b803101 Better handling of the form variable labels.
Richard Jones <richard@users.sourceforge.net>
parents: 1437
diff changeset
1661
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1662 # see if all the required properties have been supplied
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1663 s = []
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1664 for thing, required in all_required.items():
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1665 if not required:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1666 continue
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1667 if len(required) > 1:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1668 p = 'properties'
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1669 else:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1670 p = 'property'
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1671 s.append('Required %s %s %s not supplied'%(thing[0], p,
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1672 ', '.join(required)))
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1673 if s:
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1674 raise ValueError, '\n'.join(s)
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1675
1442
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1676 # check that FileClass entries have a "content" property with
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1677 # content, otherwise remove them
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1678 for (cn, id), props in all_props.items():
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1679 cl = self.db.classes[cn]
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1680 if not isinstance(cl, hyperdb.FileClass):
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1681 continue
1446
8ce33ce262a4 fix property type check, and dont create items that have no properties
Richard Jones <richard@users.sourceforge.net>
parents: 1445
diff changeset
1682 # we also don't want to create FileClass items with no content
1442
b42fa71754c9 don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents: 1438
diff changeset
1683 if not props.get('content', ''):
1443
Richard Jones <richard@users.sourceforge.net>
parents: 1442
diff changeset
1684 del all_props[(cn, id)]
1445
0bbc8be96592 handle links to nonexisting items better
Richard Jones <richard@users.sourceforge.net>
parents: 1444
diff changeset
1685 return all_props, all_links
1420
3ac43c62a250 implemented extension to form parsing...
Richard Jones <richard@users.sourceforge.net>
parents: 1417
diff changeset
1686
1254
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1687 def fixNewlines(text):
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1688 ''' Homogenise line endings.
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1689
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1690 Different web clients send different line ending values, but
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1691 other systems (eg. email) don't necessarily handle those line
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1692 endings. Our solution is to convert all line endings to LF.
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1693 '''
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1694 text = text.replace('\r\n', '\n')
77920c42aeb9 Expose the tracker config as a variable for templating
Richard Jones <richard@users.sourceforge.net>
parents: 1252
diff changeset
1695 return text.replace('\r', '\n')
1425
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1696
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1697 def extractFormList(value):
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1698 ''' Extract a list of values from the form value.
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1699
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1700 It may be one of:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1701 [MiniFieldStorage, MiniFieldStorage, ...]
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1702 MiniFieldStorage('value,value,...')
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1703 MiniFieldStorage('value')
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1704 '''
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1705 # multiple values are OK
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1706 if isinstance(value, type([])):
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1707 # it's a list of MiniFieldStorages
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1708 value = [i.value.strip() for i in value]
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1709 else:
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1710 # it's a MiniFieldStorage, but may be a comma-separated list
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1711 # of values
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1712 value = [i.strip() for i in value.value.split(',')]
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1713
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1714 # filter out the empty bits
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1715 return filter(None, value)
58ce2c1614cd new form handling complete
Richard Jones <richard@users.sourceforge.net>
parents: 1422
diff changeset
1716
Roundup Issue Tracker: http://roundup-tracker.org/