Mercurial > p > roundup > code
annotate roundup/cgi_client.py @ 359:3903aaaef4e1
Added samples for "external" CGI config
| author | Jürgen Hermann <jhermann@users.sourceforge.net> |
|---|---|
| date | Tue, 06 Nov 2001 22:22:20 +0000 |
| parents | 48ceb1667983 |
| children | ccb394667145 |
| rev | line source |
|---|---|
|
213
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
1 # |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
2 # Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/) |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
3 # This module is free software, and you may redistribute it and/or modify |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
4 # under the same terms as Python, so long as this copyright message and |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
5 # disclaimer are retained in their original form. |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
6 # |
| 214 | 7 # IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR |
|
213
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
8 # DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
9 # OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
10 # POSSIBILITY OF SUCH DAMAGE. |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
11 # |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
12 # BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
13 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
14 # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
15 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
16 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
17 # |
|
357
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
18 # $Id: cgi_client.py,v 1.51 2001-11-06 22:00:34 jhermann Exp $ |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
19 |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
20 import os, cgi, pprint, StringIO, urlparse, re, traceback, mimetypes |
|
347
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
21 import binascii, Cookie, time |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
22 |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
23 import roundupdb, htmltemplate, date, hyperdb, password |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
24 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
25 class Unauthorised(ValueError): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
26 pass |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
27 |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
28 class NotFound(ValueError): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
29 pass |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
30 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
31 class Client: |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
32 ''' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
33 A note about login |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
34 ------------------ |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
35 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
36 If the user has no login cookie, then they are anonymous. There |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
37 are two levels of anonymous use. If there is no 'anonymous' user, there |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
38 is no login at all and the database is opened in read-only mode. If the |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
39 'anonymous' user exists, the user is logged in using that user (though |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
40 there is no cookie). This allows them to modify the database, and all |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
41 modifications are attributed to the 'anonymous' user. |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
42 |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
43 |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
44 Customisation |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
45 ------------- |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
46 FILTER_POSITION - one of 'top', 'bottom', 'top and bottom' |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
47 ANONYMOUS_ACCESS - one of 'deny', 'allow' |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
48 ANONYMOUS_REGISTER - one of 'deny', 'allow' |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
49 |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
50 ''' |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
51 FILTER_POSITION = 'bottom' # one of 'top', 'bottom', 'top and bottom' |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
52 ANONYMOUS_ACCESS = 'deny' # one of 'deny', 'allow' |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
53 ANONYMOUS_REGISTER = 'deny' # one of 'deny', 'allow' |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
54 |
|
343
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
55 def __init__(self, instance, request, env): |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
56 self.instance = instance |
|
343
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
57 self.request = request |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
58 self.env = env |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
59 self.path = env['PATH_INFO'] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
60 self.split_path = self.path.split('/') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
61 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
62 self.form = cgi.FieldStorage(environ=env) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
63 self.headers_done = 0 |
|
357
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
64 try: |
|
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
65 self.debug = int(env.get("ROUNDUP_DEBUG", 0)) |
|
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
66 except ValueError: |
|
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
67 # someone gave us a non-int debug level, turn it off |
|
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
68 self.debug = 0 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
69 |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
70 def getuid(self): |
|
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
71 return self.db.user.lookup(self.user) |
|
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
72 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
73 def header(self, headers={'Content-Type':'text/html'}): |
|
343
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
74 '''Put up the appropriate header. |
|
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
75 ''' |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
76 if not headers.has_key('Content-Type'): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
77 headers['Content-Type'] = 'text/html' |
|
343
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
78 self.request.send_response(200) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
79 for entry in headers.items(): |
|
343
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
80 self.request.send_header(*entry) |
|
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
81 self.request.end_headers() |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
82 self.headers_done = 1 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
83 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
84 def pagehead(self, title, message=None): |
|
333
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
85 url = self.env['SCRIPT_NAME'] + '/' |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
86 machine = self.env['SERVER_NAME'] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
87 port = self.env['SERVER_PORT'] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
88 if port != '80': machine = machine + ':' + port |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
89 base = urlparse.urlunparse(('http', machine, url, None, None, None)) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
90 if message is not None: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
91 message = '<div class="system-msg">%s</div>'%message |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
92 else: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
93 message = '' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
94 style = open(os.path.join(self.TEMPLATES, 'style.css')).read() |
|
333
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
95 user_name = self.user or '' |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
96 if self.user == 'admin': |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
97 admin_links = ' | <a href="list_classes">Class List</a>' |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
98 else: |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
99 admin_links = '' |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
100 if self.user not in (None, 'anonymous'): |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
101 userid = self.db.user.lookup(self.user) |
|
333
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
102 user_info = ''' |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
103 <a href="issue?assignedto=%s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=activity&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">My Issues</a> | |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
104 <a href="user%s">My Details</a> | <a href="logout">Logout</a> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
105 '''%(userid, userid) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
106 else: |
|
333
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
107 user_info = '<a href="login">Login</a>' |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
108 if self.user is not None: |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
109 add_links = ''' |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
110 | Add |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
111 <a href="newissue">Issue</a>, |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
112 <a href="newuser">User</a> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
113 ''' |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
114 else: |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
115 add_links = '' |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
116 self.write('''<html><head> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
117 <title>%s</title> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
118 <style type="text/css">%s</style> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
119 </head> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
120 <body bgcolor=#ffffff> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
121 %s |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
122 <table width=100%% border=0 cellspacing=0 cellpadding=2> |
|
333
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
123 <tr class="location-bar"><td><big><strong>%s</strong></big></td> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
124 <td align=right valign=bottom>%s</td></tr> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
125 <tr class="location-bar"> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
126 <td align=left>All |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
127 <a href="issue?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
128 | Unassigned |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
129 <a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
130 %s |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
131 %s</td> |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
132 <td align=right>%s</td> |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
133 </table> |
|
333
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
134 '''%(title, style, message, title, user_name, add_links, admin_links, |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
135 user_info)) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
136 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
137 def pagefoot(self): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
138 if self.debug: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
139 self.write('<hr><small><dl>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
140 self.write('<dt><b>Path</b></dt>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
141 self.write('<dd>%s</dd>'%(', '.join(map(repr, self.split_path)))) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
142 keys = self.form.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
143 keys.sort() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
144 if keys: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
145 self.write('<dt><b>Form entries</b></dt>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
146 for k in self.form.keys(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
147 v = str(self.form[k].value) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
148 self.write('<dd><em>%s</em>:%s</dd>'%(k, cgi.escape(v))) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
149 keys = self.env.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
150 keys.sort() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
151 self.write('<dt><b>CGI environment</b></dt>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
152 for k in keys: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
153 v = self.env[k] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
154 self.write('<dd><em>%s</em>:%s</dd>'%(k, cgi.escape(v))) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
155 self.write('</dl></small>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
156 self.write('</body></html>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
157 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
158 def write(self, content): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
159 if not self.headers_done: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
160 self.header() |
|
343
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
161 self.request.wfile.write(content) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
162 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
163 def index_arg(self, arg): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
164 ''' handle the args to index - they might be a list from the form |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
165 (ie. submitted from a form) or they might be a command-separated |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
166 single string (ie. manually constructed GET args) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
167 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
168 if self.form.has_key(arg): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
169 arg = self.form[arg] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
170 if type(arg) == type([]): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
171 return [arg.value for arg in arg] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
172 return arg.value.split(',') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
173 return [] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
174 |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
175 def index_filterspec(self, filter): |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
176 ''' pull the index filter spec from the form |
|
128
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
177 |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
178 Links and multilinks want to be lists - the rest are straight |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
179 strings. |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
180 ''' |
|
128
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
181 props = self.db.classes[self.classname].getprops() |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
182 # all the form args not starting with ':' are filters |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
183 filterspec = {} |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
184 for key in self.form.keys(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
185 if key[0] == ':': continue |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
186 if not props.has_key(key): continue |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
187 if key not in filter: continue |
|
128
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
188 prop = props[key] |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
189 value = self.form[key] |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
190 if (isinstance(prop, hyperdb.Link) or |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
191 isinstance(prop, hyperdb.Multilink)): |
|
128
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
192 if type(value) == type([]): |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
193 value = [arg.value for arg in value] |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
194 else: |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
195 value = value.value.split(',') |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
196 l = filterspec.get(key, []) |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
197 l = l + value |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
198 filterspec[key] = l |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
199 else: |
|
128
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
200 filterspec[key] = value.value |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
201 return filterspec |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
202 |
|
307
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
203 def customization_widget(self): |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
204 ''' The customization widget is visible by default. The widget |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
205 visibility is remembered by show_customization. Visibility |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
206 is not toggled if the action value is "Redisplay" |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
207 ''' |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
208 if not self.form.has_key('show_customization'): |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
209 visible = 1 |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
210 else: |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
211 visible = int(self.form['show_customization'].value) |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
212 if self.form.has_key('action'): |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
213 if self.form['action'].value != 'Redisplay': |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
214 visible = self.form['action'].value == '+' |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
215 |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
216 return visible |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
217 |
|
117
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
218 default_index_sort = ['-activity'] |
|
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
219 default_index_group = ['priority'] |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
220 default_index_filter = ['status'] |
|
142
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
221 default_index_columns = ['id','activity','title','status','assignedto'] |
|
117
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
222 default_index_filterspec = {'status': ['1', '2', '3', '4', '5', '6', '7']} |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
223 def index(self): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
224 ''' put up an index |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
225 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
226 self.classname = 'issue' |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
227 # see if the web has supplied us with any customisation info |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
228 defaults = 1 |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
229 for key in ':sort', ':group', ':filter', ':columns': |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
230 if self.form.has_key(key): |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
231 defaults = 0 |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
232 break |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
233 if defaults: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
234 # no info supplied - use the defaults |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
235 sort = self.default_index_sort |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
236 group = self.default_index_group |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
237 filter = self.default_index_filter |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
238 columns = self.default_index_columns |
|
117
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
239 filterspec = self.default_index_filterspec |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
240 else: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
241 sort = self.index_arg(':sort') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
242 group = self.index_arg(':group') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
243 filter = self.index_arg(':filter') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
244 columns = self.index_arg(':columns') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
245 filterspec = self.index_filterspec(filter) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
246 return self.list(columns=columns, filter=filter, group=group, |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
247 sort=sort, filterspec=filterspec) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
248 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
249 # XXX deviates from spec - loses the '+' (that's a reserved character |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
250 # in URLS |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
251 def list(self, sort=None, group=None, filter=None, columns=None, |
|
307
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
252 filterspec=None, show_customization=None): |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
253 ''' call the template index with the args |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
254 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
255 :sort - sort by prop name, optionally preceeded with '-' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
256 to give descending or nothing for ascending sorting. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
257 :group - group by prop name, optionally preceeded with '-' or |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
258 to sort in descending or nothing for ascending order. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
259 :filter - selects which props should be displayed in the filter |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
260 section. Default is all. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
261 :columns - selects the columns that should be displayed. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
262 Default is all. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
263 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
264 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
265 cn = self.classname |
|
117
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
266 self.pagehead('Index of %s'%cn) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
267 if sort is None: sort = self.index_arg(':sort') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
268 if group is None: group = self.index_arg(':group') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
269 if filter is None: filter = self.index_arg(':filter') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
270 if columns is None: columns = self.index_arg(':columns') |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
271 if filterspec is None: filterspec = self.index_filterspec(filter) |
|
307
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
272 if show_customization is None: |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
273 show_customization = self.customization_widget() |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
274 |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
275 index = htmltemplate.IndexTemplate(self, self.TEMPLATES, cn) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
276 index.render(filterspec, filter, columns, sort, group, |
|
307
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
277 show_customization=show_customization) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
278 self.pagefoot() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
279 |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
280 def shownode(self, message=None): |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
281 ''' display an item |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
282 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
283 cn = self.classname |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
284 cl = self.db.classes[cn] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
285 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
286 # possibly perform an edit |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
287 keys = self.form.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
288 num_re = re.compile('^\d+$') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
289 if keys: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
290 try: |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
291 props, changed = parsePropsFromForm(self.db, cl, self.form, |
|
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
292 self.nodeid) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
293 cl.set(self.nodeid, **props) |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
294 self._post_editnode(self.nodeid, changed) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
295 # and some nice feedback for the user |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
296 message = '%s edited ok'%', '.join(changed) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
297 except: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
298 s = StringIO.StringIO() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
299 traceback.print_exc(None, s) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
300 message = '<pre>%s</pre>'%cgi.escape(s.getvalue()) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
301 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
302 # now the display |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
303 id = self.nodeid |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
304 if cl.getkey(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
305 id = cl.get(id, cl.getkey()) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
306 self.pagehead('%s: %s'%(self.classname.capitalize(), id), message) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
307 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
308 nodeid = self.nodeid |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
309 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
310 # use the template to display the item |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
311 item = htmltemplate.ItemTemplate(self, self.TEMPLATES, self.classname) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
312 item.render(nodeid) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
313 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
314 self.pagefoot() |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
315 showissue = shownode |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
316 showmsg = shownode |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
317 |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
318 def showuser(self, message=None): |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
319 '''Display a user page for editing. Make sure the user is allowed |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
320 to edit this node, and also check for password changes. |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
321 ''' |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
322 if self.user == 'anonymous': |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
323 raise Unauthorised |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
324 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
325 user = self.db.user |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
326 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
327 # get the username of the node being edited |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
328 node_user = user.get(self.nodeid, 'username') |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
329 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
330 if self.user not in ('admin', node_user): |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
331 raise Unauthorised |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
332 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
333 # |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
334 # perform any editing |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
335 # |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
336 keys = self.form.keys() |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
337 num_re = re.compile('^\d+$') |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
338 if keys: |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
339 try: |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
340 props, changed = parsePropsFromForm(self.db, user, self.form, |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
341 self.nodeid) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
342 if self.nodeid == self.getuid() and 'password' in changed: |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
343 set_cookie = self.form['password'].value.strip() |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
344 else: |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
345 set_cookie = 0 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
346 user.set(self.nodeid, **props) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
347 self._post_editnode(self.nodeid, changed) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
348 # and some feedback for the user |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
349 message = '%s edited ok'%', '.join(changed) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
350 except: |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
351 s = StringIO.StringIO() |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
352 traceback.print_exc(None, s) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
353 message = '<pre>%s</pre>'%cgi.escape(s.getvalue()) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
354 else: |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
355 set_cookie = 0 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
356 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
357 # fix the cookie if the password has changed |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
358 if set_cookie: |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
359 self.set_cookie(self.user, set_cookie) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
360 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
361 # |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
362 # now the display |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
363 # |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
364 self.pagehead('User: %s'%node_user, message) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
365 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
366 # use the template to display the item |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
367 item = htmltemplate.ItemTemplate(self, self.TEMPLATES, 'user') |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
368 item.render(self.nodeid) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
369 self.pagefoot() |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
370 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
371 def showfile(self): |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
372 ''' display a file |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
373 ''' |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
374 nodeid = self.nodeid |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
375 cl = self.db.file |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
376 type = cl.get(nodeid, 'type') |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
377 if type == 'message/rfc822': |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
378 type = 'text/plain' |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
379 self.header(headers={'Content-Type': type}) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
380 self.write(cl.get(nodeid, 'content')) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
381 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
382 def _createnode(self): |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
383 ''' create a node based on the contents of the form |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
384 ''' |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
385 cl = self.db.classes[self.classname] |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
386 props, dummy = parsePropsFromForm(self.db, cl, self.form) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
387 return cl.create(**props) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
388 |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
389 def _post_editnode(self, nid, changes=None): |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
390 ''' do the linking and message sending part of the node creation |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
391 ''' |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
392 cn = self.classname |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
393 cl = self.db.classes[cn] |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
394 # link if necessary |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
395 keys = self.form.keys() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
396 for key in keys: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
397 if key == ':multilink': |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
398 value = self.form[key].value |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
399 if type(value) != type([]): value = [value] |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
400 for value in value: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
401 designator, property = value.split(':') |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
402 link, nodeid = roundupdb.splitDesignator(designator) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
403 link = self.db.classes[link] |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
404 value = link.get(nodeid, property) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
405 value.append(nid) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
406 link.set(nodeid, **{property: value}) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
407 elif key == ':link': |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
408 value = self.form[key].value |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
409 if type(value) != type([]): value = [value] |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
410 for value in value: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
411 designator, property = value.split(':') |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
412 link, nodeid = roundupdb.splitDesignator(designator) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
413 link = self.db.classes[link] |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
414 link.set(nodeid, **{property: nid}) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
415 |
|
238
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
416 # generate an edit message |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
417 # don't bother if there's no messages or nosy list |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
418 props = cl.getprops() |
|
238
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
419 note = None |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
420 if self.form.has_key('__note'): |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
421 note = self.form['__note'] |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
422 note = note.value |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
423 send = len(cl.get(nid, 'nosy', [])) or note |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
424 if (send and props.has_key('messages') and |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
425 isinstance(props['messages'], hyperdb.Multilink) and |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
426 props['messages'].classname == 'msg'): |
|
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
427 |
|
178
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
428 # handle the note |
|
238
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
429 if note: |
|
178
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
430 if '\n' in note: |
|
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
431 summary = re.split(r'\n\r?', note)[0] |
|
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
432 else: |
|
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
433 summary = note |
|
181
817750ead8d5
bleah syntax error
Richard Jones <richard@users.sourceforge.net>
parents:
178
diff
changeset
|
434 m = ['%s\n'%note] |
|
178
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
435 else: |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
436 summary = 'This %s has been edited through the web.\n'%cn |
|
178
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
437 m = [summary] |
|
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
438 |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
439 first = 1 |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
440 for name, prop in props.items(): |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
441 if changes is not None and name not in changes: continue |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
442 if first: |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
443 m.append('\n-------') |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
444 first = 0 |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
445 value = cl.get(nid, name, None) |
|
224
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
446 if isinstance(prop, hyperdb.Link): |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
447 link = self.db.classes[prop.classname] |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
448 key = link.labelprop(default_to_id=1) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
449 if value is not None and key: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
450 value = link.get(value, key) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
451 else: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
452 value = '-' |
|
224
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
453 elif isinstance(prop, hyperdb.Multilink): |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
454 if value is None: value = [] |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
455 l = [] |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
456 link = self.db.classes[prop.classname] |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
457 key = link.labelprop(default_to_id=1) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
458 for entry in value: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
459 if key: |
|
267
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
460 l.append(link.get(entry, key)) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
461 else: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
462 l.append(entry) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
463 value = ', '.join(l) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
464 m.append('%s: %s'%(name, value)) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
465 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
466 # now create the message |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
467 content = '\n'.join(m) |
|
237
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
468 message_id = self.db.msg.create(author=self.getuid(), |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
469 recipients=[], date=date.Date('.'), summary=summary, |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
470 content=content) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
471 messages = cl.get(nid, 'messages') |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
472 messages.append(message_id) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
473 props = {'messages': messages} |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
474 cl.set(nid, **props) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
475 |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
476 def newnode(self, message=None): |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
477 ''' Add a new node to the database. |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
478 |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
479 The form works in two modes: blank form and submission (that is, |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
480 the submission goes to the same URL). **Eventually this means that |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
481 the form will have previously entered information in it if |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
482 submission fails. |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
483 |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
484 The new node will be created with the properties specified in the |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
485 form submission. For multilinks, multiple form entries are handled, |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
486 as are prop=value,value,value. You can't mix them though. |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
487 |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
488 If the new node is to be referenced from somewhere else immediately |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
489 (ie. the new node is a file that is to be attached to a support |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
490 issue) then supply one of these arguments in addition to the usual |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
491 form entries: |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
492 :link=designator:property |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
493 :multilink=designator:property |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
494 ... which means that once the new node is created, the "property" |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
495 on the node given by "designator" should now reference the new |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
496 node's id. The node id will be appended to the multilink. |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
497 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
498 cn = self.classname |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
499 cl = self.db.classes[cn] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
500 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
501 # possibly perform a create |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
502 keys = self.form.keys() |
|
162
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
503 if [i for i in keys if i[0] != ':']: |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
504 props = {} |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
505 try: |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
506 nid = self._createnode() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
507 self._post_editnode(nid) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
508 # and some nice feedback for the user |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
509 message = '%s created ok'%cn |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
510 except: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
511 s = StringIO.StringIO() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
512 traceback.print_exc(None, s) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
513 message = '<pre>%s</pre>'%cgi.escape(s.getvalue()) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
514 self.pagehead('New %s'%self.classname.capitalize(), message) |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
515 |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
516 # call the template |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
517 newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES, |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
518 self.classname) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
519 newitem.render(self.form) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
520 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
521 self.pagefoot() |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
522 newissue = newnode |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
523 newuser = newnode |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
524 |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
525 def newfile(self, message=None): |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
526 ''' Add a new file to the database. |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
527 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
528 This form works very much the same way as newnode - it just has a |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
529 file upload. |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
530 ''' |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
531 cn = self.classname |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
532 cl = self.db.classes[cn] |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
533 |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
534 # possibly perform a create |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
535 keys = self.form.keys() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
536 if [i for i in keys if i[0] != ':']: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
537 try: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
538 file = self.form['content'] |
|
247
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
539 type = mimetypes.guess_type(file.filename)[0] |
|
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
540 if not type: |
|
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
541 type = "application/octet-stream" |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
542 self._post_editnode(cl.create(content=file.file.read(), |
|
247
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
543 type=type, name=file.filename)) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
544 # and some nice feedback for the user |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
545 message = '%s created ok'%cn |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
546 except: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
547 s = StringIO.StringIO() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
548 traceback.print_exc(None, s) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
549 message = '<pre>%s</pre>'%cgi.escape(s.getvalue()) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
550 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
551 self.pagehead('New %s'%self.classname.capitalize(), message) |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
552 newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES, |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
553 self.classname) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
554 newitem.render(self.form) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
555 self.pagefoot() |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
556 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
557 def classes(self, message=None): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
558 ''' display a list of all the classes in the database |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
559 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
560 if self.user == 'admin': |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
561 self.pagehead('Table of classes', message) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
562 classnames = self.db.classes.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
563 classnames.sort() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
564 self.write('<table border=0 cellspacing=0 cellpadding=2>\n') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
565 for cn in classnames: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
566 cl = self.db.getclass(cn) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
567 self.write('<tr class="list-header"><th colspan=2 align=left>%s</th></tr>'%cn.capitalize()) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
568 for key, value in cl.properties.items(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
569 if value is None: value = '' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
570 else: value = str(value) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
571 self.write('<tr><th align=left>%s</th><td>%s</td></tr>'%( |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
572 key, cgi.escape(value))) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
573 self.write('</table>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
574 self.pagefoot() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
575 else: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
576 raise Unauthorised |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
577 |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
578 def login(self, message=None, newuser_form=None): |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
579 self.pagehead('Login to roundup', message) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
580 self.write(''' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
581 <table> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
582 <tr><td colspan=2 class="strong-header">Existing User Login</td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
583 <form action="login_action" method=POST> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
584 <tr><td align=right>Login name: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
585 <td><input name="__login_name"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
586 <tr><td align=right>Password: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
587 <td><input type="password" name="__login_password"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
588 <tr><td></td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
589 <td><input type="submit" value="Log In"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
590 </form> |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
591 ''') |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
592 if self.user is None and self.ANONYMOUS_REGISTER == 'deny': |
|
349
688dd65c0e75
Oops. uses pagefoot now.
Richard Jones <richard@users.sourceforge.net>
parents:
348
diff
changeset
|
593 self.write('</table>') |
|
688dd65c0e75
Oops. uses pagefoot now.
Richard Jones <richard@users.sourceforge.net>
parents:
348
diff
changeset
|
594 self.pagefoot() |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
595 return |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
596 values = {'realname': '', 'organisation': '', 'address': '', |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
597 'phone': '', 'username': '', 'password': '', 'confirm': ''} |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
598 if newuser_form is not None: |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
599 for key in newuser_form.keys(): |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
600 values[key] = newuser_form[key].value |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
601 self.write(''' |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
602 <p> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
603 <tr><td colspan=2 class="strong-header">New User Registration</td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
604 <tr><td colspan=2><em>marked items</em> are optional...</td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
605 <form action="newuser_action" method=POST> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
606 <tr><td align=right><em>Name: </em></td> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
607 <td><input name="realname" value="%(realname)s"></td></tr> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
608 <tr><td align=right><em>Organisation: </em></td> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
609 <td><input name="organisation" value="%(organisation)s"></td></tr> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
610 <tr><td align=right>E-Mail Address: </td> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
611 <td><input name="address" value="%(address)s"></td></tr> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
612 <tr><td align=right><em>Phone: </em></td> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
613 <td><input name="phone" value="%(phone)s"></td></tr> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
614 <tr><td align=right>Preferred Login name: </td> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
615 <td><input name="username" value="%(username)s"></td></tr> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
616 <tr><td align=right>Password: </td> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
617 <td><input type="password" name="password" value="%(password)s"></td></tr> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
618 <tr><td align=right>Password Again: </td> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
619 <td><input type="password" name="confirm" value="%(confirm)s"></td></tr> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
620 <tr><td></td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
621 <td><input type="submit" value="Register"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
622 </form> |
|
349
688dd65c0e75
Oops. uses pagefoot now.
Richard Jones <richard@users.sourceforge.net>
parents:
348
diff
changeset
|
623 </table> |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
624 '''%values) |
|
349
688dd65c0e75
Oops. uses pagefoot now.
Richard Jones <richard@users.sourceforge.net>
parents:
348
diff
changeset
|
625 self.pagefoot() |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
626 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
627 def login_action(self, message=None): |
|
302
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
628 if not self.form.has_key('__login_name'): |
|
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
629 return self.login(message='Username required') |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
630 self.user = self.form['__login_name'].value |
|
302
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
631 if self.form.has_key('__login_password'): |
|
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
632 password = self.form['__login_password'].value |
|
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
633 else: |
|
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
634 password = '' |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
635 # make sure the user exists |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
636 try: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
637 uid = self.db.user.lookup(self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
638 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
639 name = self.user |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
640 self.make_user_anonymous() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
641 return self.login(message='No such user "%s"'%name) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
642 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
643 # and that the password is correct |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
644 pw = self.db.user.get(uid, 'password') |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
645 if password != self.db.user.get(uid, 'password'): |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
646 self.make_user_anonymous() |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
647 return self.login(message='Incorrect password') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
648 |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
649 self.set_cookie(self.user, password) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
650 return self.index() |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
651 |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
652 def set_cookie(self, user, password): |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
653 # construct the cookie |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
654 user = binascii.b2a_base64('%s:%s'%(user, password)).strip() |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
655 path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME'])) |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
656 self.header({'Set-Cookie': 'roundup_user="%s"; Path="%s";'%(user, |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
657 path)}) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
658 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
659 def make_user_anonymous(self): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
660 # make us anonymous if we can |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
661 try: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
662 self.db.user.lookup('anonymous') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
663 self.user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
664 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
665 self.user = None |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
666 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
667 def logout(self, message=None): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
668 self.make_user_anonymous() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
669 # construct the logout cookie |
|
295
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
670 now = Cookie._getdate() |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
671 path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME'])) |
|
295
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
672 self.header({'Set-Cookie': |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
673 'roundup_user=deleted; Max-Age=0; expires="%s"; Path="%s";'%(now, |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
674 path)}) |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
675 return self.login() |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
676 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
677 def newuser_action(self, message=None): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
678 ''' create a new user based on the contents of the form and then |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
679 set the cookie |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
680 ''' |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
681 # re-open the database as "admin" |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
682 self.db.close() |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
683 self.db = self.instance.open('admin') |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
684 |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
685 # TODO: pre-check the required fields and username key property |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
686 cl = self.db.user |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
687 try: |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
688 props, dummy = parsePropsFromForm(self.db, cl, self.form) |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
689 uid = cl.create(**props) |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
690 except ValueError, message: |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
691 return self.login(message, newuser_form=self.form) |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
692 self.user = cl.get(uid, 'username') |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
693 password = cl.get(uid, 'password') |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
694 self.set_cookie(self.user, self.form['password'].value) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
695 return self.index() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
696 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
697 def main(self, dre=re.compile(r'([^\d]+)(\d+)'), |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
698 nre=re.compile(r'new(\w+)')): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
699 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
700 # determine the uid to use |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
701 self.db = self.instance.open('admin') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
702 cookie = Cookie.Cookie(self.env.get('HTTP_COOKIE', '')) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
703 user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
704 if (cookie.has_key('roundup_user') and |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
705 cookie['roundup_user'].value != 'deleted'): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
706 cookie = cookie['roundup_user'].value |
|
347
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
707 user, password = binascii.a2b_base64(cookie).split(':') |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
708 # make sure the user exists |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
709 try: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
710 uid = self.db.user.lookup(user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
711 # now validate the password |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
712 if password != self.db.user.get(uid, 'password'): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
713 user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
714 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
715 user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
716 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
717 # make sure the anonymous user is valid if we're using it |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
718 if user == 'anonymous': |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
719 self.make_user_anonymous() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
720 else: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
721 self.user = user |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
722 self.db.close() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
723 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
724 # re-open the database for real, using the user |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
725 self.db = self.instance.open(self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
726 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
727 # now figure which function to call |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
728 path = self.split_path |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
729 if not path or path[0] in ('', 'index'): |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
730 action = 'index' |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
731 else: |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
732 action = path[0] |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
733 |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
734 # Everthing ignores path[1:] |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
735 # - The file download link generator actually relies on this - it |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
736 # appends the name of the file to the URL so the download file name |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
737 # is correct, but doesn't actually use it. |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
738 |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
739 # everyone is allowed to try to log in |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
740 if action == 'login_action': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
741 return self.login_action() |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
742 |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
743 # allow anonymous people to register |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
744 if action == 'newuser_action': |
|
326
36e812156746
More fixes to lockout logic.
Richard Jones <richard@users.sourceforge.net>
parents:
325
diff
changeset
|
745 # if we don't have a login and anonymous people aren't allowed to |
|
36e812156746
More fixes to lockout logic.
Richard Jones <richard@users.sourceforge.net>
parents:
325
diff
changeset
|
746 # register, then spit up the login form |
|
36e812156746
More fixes to lockout logic.
Richard Jones <richard@users.sourceforge.net>
parents:
325
diff
changeset
|
747 if self.ANONYMOUS_REGISTER == 'deny' and self.user is None: |
|
36e812156746
More fixes to lockout logic.
Richard Jones <richard@users.sourceforge.net>
parents:
325
diff
changeset
|
748 return self.login() |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
749 return self.newuser_action() |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
750 |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
751 # make sure totally anonymous access is OK |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
752 if self.ANONYMOUS_ACCESS == 'deny' and self.user is None: |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
753 return self.login() |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
754 |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
755 # here be the "normal" functionality |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
756 if action == 'index': |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
757 return self.index() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
758 if action == 'list_classes': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
759 return self.classes() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
760 if action == 'login': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
761 return self.login() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
762 if action == 'logout': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
763 return self.logout() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
764 m = dre.match(action) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
765 if m: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
766 self.classname = m.group(1) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
767 self.nodeid = m.group(2) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
768 try: |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
769 cl = self.db.classes[self.classname] |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
770 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
771 raise NotFound |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
772 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
773 cl.get(self.nodeid, 'id') |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
774 except IndexError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
775 raise NotFound |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
776 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
777 func = getattr(self, 'show%s'%self.classname) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
778 except AttributeError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
779 raise NotFound |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
780 return func() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
781 m = nre.match(action) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
782 if m: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
783 self.classname = m.group(1) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
784 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
785 func = getattr(self, 'new%s'%self.classname) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
786 except AttributeError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
787 raise NotFound |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
788 return func() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
789 self.classname = action |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
790 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
791 self.db.getclass(self.classname) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
792 except KeyError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
793 raise NotFound |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
794 self.list() |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
795 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
796 def __del__(self): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
797 self.db.close() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
798 |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
799 |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
800 class ExtendedClient(Client): |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
801 '''Includes pages and page heading information that relate to the |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
802 extended schema. |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
803 ''' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
804 showsupport = Client.shownode |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
805 showtimelog = Client.shownode |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
806 newsupport = Client.newnode |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
807 newtimelog = Client.newnode |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
808 |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
809 default_index_sort = ['-activity'] |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
810 default_index_group = ['priority'] |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
811 default_index_filter = ['status'] |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
812 default_index_columns = ['activity','status','title','assignedto'] |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
813 default_index_filterspec = {'status': ['1', '2', '3', '4', '5', '6', '7']} |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
814 |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
815 def pagehead(self, title, message=None): |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
816 url = self.env['SCRIPT_NAME'] + '/' #self.env.get('PATH_INFO', '/') |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
817 machine = self.env['SERVER_NAME'] |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
818 port = self.env['SERVER_PORT'] |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
819 if port != '80': machine = machine + ':' + port |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
820 base = urlparse.urlunparse(('http', machine, url, None, None, None)) |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
821 if message is not None: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
822 message = '<div class="system-msg">%s</div>'%message |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
823 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
824 message = '' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
825 style = open(os.path.join(self.TEMPLATES, 'style.css')).read() |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
826 user_name = self.user or '' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
827 if self.user == 'admin': |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
828 admin_links = ' | <a href="list_classes">Class List</a>' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
829 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
830 admin_links = '' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
831 if self.user not in (None, 'anonymous'): |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
832 userid = self.db.user.lookup(self.user) |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
833 user_info = ''' |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
834 <a href="issue?assignedto=%s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=activity&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">My Issues</a> | |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
835 <a href="support?assignedto=%s&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:filter=status,assignedto&:sort=activity&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">My Support</a> | |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
836 <a href="user%s">My Details</a> | <a href="logout">Logout</a> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
837 '''%(userid, userid, userid) |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
838 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
839 user_info = '<a href="login">Login</a>' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
840 if self.user is not None: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
841 add_links = ''' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
842 | Add |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
843 <a href="newissue">Issue</a>, |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
844 <a href="newsupport">Support</a>, |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
845 <a href="newuser">User</a> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
846 ''' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
847 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
848 add_links = '' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
849 self.write('''<html><head> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
850 <title>%s</title> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
851 <style type="text/css">%s</style> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
852 </head> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
853 <body bgcolor=#ffffff> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
854 %s |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
855 <table width=100%% border=0 cellspacing=0 cellpadding=2> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
856 <tr class="location-bar"><td><big><strong>%s</strong></big></td> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
857 <td align=right valign=bottom>%s</td></tr> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
858 <tr class="location-bar"> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
859 <td align=left>All |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
860 <a href="issue?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>, |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
861 <a href="support?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">Support</a> |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
862 | Unassigned |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
863 <a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>, |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
864 <a href="support?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=customername&show_customization=1">Support</a> |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
865 %s |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
866 %s</td> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
867 <td align=right>%s</td> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
868 </table> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
869 '''%(title, style, message, title, user_name, add_links, admin_links, |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
870 user_info)) |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
871 |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
872 def parsePropsFromForm(db, cl, form, nodeid=0): |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
873 '''Pull properties for the given class out of the form. |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
874 ''' |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
875 props = {} |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
876 changed = [] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
877 keys = form.keys() |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
878 num_re = re.compile('^\d+$') |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
879 for key in keys: |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
880 if not cl.properties.has_key(key): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
881 continue |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
882 proptype = cl.properties[key] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
883 if isinstance(proptype, hyperdb.String): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
884 value = form[key].value.strip() |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
885 elif isinstance(proptype, hyperdb.Password): |
|
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
886 value = password.Password(form[key].value.strip()) |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
887 elif isinstance(proptype, hyperdb.Date): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
888 value = date.Date(form[key].value.strip()) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
889 elif isinstance(proptype, hyperdb.Interval): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
890 value = date.Interval(form[key].value.strip()) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
891 elif isinstance(proptype, hyperdb.Link): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
892 value = form[key].value.strip() |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
893 # see if it's the "no selection" choice |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
894 if value == '-1': |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
895 # don't set this property |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
896 continue |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
897 else: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
898 # handle key values |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
899 link = cl.properties[key].classname |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
900 if not num_re.match(value): |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
901 try: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
902 value = db.classes[link].lookup(value) |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
903 except KeyError: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
904 raise ValueError, 'property "%s": %s not a %s'%( |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
905 key, value, link) |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
906 elif isinstance(proptype, hyperdb.Multilink): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
907 value = form[key] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
908 if type(value) != type([]): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
909 value = [i.strip() for i in value.value.split(',')] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
910 else: |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
911 value = [i.value.strip() for i in value] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
912 link = cl.properties[key].classname |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
913 l = [] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
914 for entry in map(str, value): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
915 if not num_re.match(entry): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
916 try: |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
917 entry = db.classes[link].lookup(entry) |
|
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
918 except KeyError: |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
919 raise ValueError, \ |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
920 'property "%s": "%s" not an entry of %s'%(key, |
|
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
921 entry, link.capitalize()) |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
922 l.append(entry) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
923 l.sort() |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
924 value = l |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
925 props[key] = value |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
926 # if changed, set it |
|
236
8827f5931ea8
Fixed CGI client change messages...
Richard Jones <richard@users.sourceforge.net>
parents:
232
diff
changeset
|
927 if nodeid and value != cl.get(nodeid, key): |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
928 changed.append(key) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
929 props[key] = value |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
930 return props, changed |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
931 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
932 # |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
933 # $Log: not supported by cvs2svn $ |
|
357
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
934 # Revision 1.50 2001/11/05 23:45:40 richard |
|
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
935 # Fixed newuser_action so it sets the cookie with the unencrypted password. |
|
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
936 # Also made it present nicer error messages (not tracebacks). |
|
48ceb1667983
Get debug level from ROUNDUP_DEBUG env var
Jürgen Hermann <jhermann@users.sourceforge.net>
parents:
354
diff
changeset
|
937 # |
|
354
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
938 # Revision 1.49 2001/11/04 03:07:12 richard |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
939 # Fixed various cookie-related bugs: |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
940 # . bug #477685 ] base64.decodestring breaks |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
941 # . bug #477837 ] lynx does not like the cookie |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
942 # . bug #477892 ] Password edit doesn't fix login cookie |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
943 # Also closed a security hole - a logged-in user could edit another user's |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
944 # details. |
|
f90abe9e811d
Fixed newuser_action so it sets the cookie with the unencrypted password.
Richard Jones <richard@users.sourceforge.net>
parents:
353
diff
changeset
|
945 # |
|
353
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
946 # Revision 1.48 2001/11/03 01:30:18 richard |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
947 # Oops. uses pagefoot now. |
|
6713716d8ae9
Fixed various cookie-related bugs:
Richard Jones <richard@users.sourceforge.net>
parents:
349
diff
changeset
|
948 # |
|
349
688dd65c0e75
Oops. uses pagefoot now.
Richard Jones <richard@users.sourceforge.net>
parents:
348
diff
changeset
|
949 # Revision 1.47 2001/11/03 01:29:28 richard |
|
688dd65c0e75
Oops. uses pagefoot now.
Richard Jones <richard@users.sourceforge.net>
parents:
348
diff
changeset
|
950 # Login page didn't have all close tags. |
|
688dd65c0e75
Oops. uses pagefoot now.
Richard Jones <richard@users.sourceforge.net>
parents:
348
diff
changeset
|
951 # |
|
348
870b24383309
Login page didn't have all close tags.
Richard Jones <richard@users.sourceforge.net>
parents:
347
diff
changeset
|
952 # Revision 1.46 2001/11/03 01:26:55 richard |
|
870b24383309
Login page didn't have all close tags.
Richard Jones <richard@users.sourceforge.net>
parents:
347
diff
changeset
|
953 # possibly fix truncated base64'ed user:pass |
|
870b24383309
Login page didn't have all close tags.
Richard Jones <richard@users.sourceforge.net>
parents:
347
diff
changeset
|
954 # |
|
347
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
955 # Revision 1.45 2001/11/01 22:04:37 richard |
|
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
956 # Started work on supporting a pop3-fetching server |
|
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
957 # Fixed bugs: |
|
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
958 # . bug #477104 ] HTML tag error in roundup-server |
|
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
959 # . bug #477107 ] HTTP header problem |
|
db8514399149
possibly fix truncated base64'ed user:pass
Richard Jones <richard@users.sourceforge.net>
parents:
343
diff
changeset
|
960 # |
|
343
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
961 # Revision 1.44 2001/10/28 23:03:08 richard |
|
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
962 # Added more useful header to the classic schema. |
|
ab16997d9cda
Started work on supporting a pop3-fetching server
Richard Jones <richard@users.sourceforge.net>
parents:
333
diff
changeset
|
963 # |
|
333
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
964 # Revision 1.43 2001/10/24 00:01:42 richard |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
965 # More fixes to lockout logic. |
|
4609a1ea94ff
Added more useful header to the classic schema.
Richard Jones <richard@users.sourceforge.net>
parents:
326
diff
changeset
|
966 # |
|
326
36e812156746
More fixes to lockout logic.
Richard Jones <richard@users.sourceforge.net>
parents:
325
diff
changeset
|
967 # Revision 1.42 2001/10/23 23:56:03 richard |
|
36e812156746
More fixes to lockout logic.
Richard Jones <richard@users.sourceforge.net>
parents:
325
diff
changeset
|
968 # HTML typo |
|
36e812156746
More fixes to lockout logic.
Richard Jones <richard@users.sourceforge.net>
parents:
325
diff
changeset
|
969 # |
| 325 | 970 # Revision 1.41 2001/10/23 23:52:35 richard |
| 971 # Fixed lock-out logic, thanks Roch'e for pointing out the problems. | |
| 972 # | |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
973 # Revision 1.40 2001/10/23 23:06:39 richard |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
974 # Some cleanup. |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
975 # |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
976 # Revision 1.39 2001/10/23 01:00:18 richard |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
977 # Re-enabled login and registration access after lopping them off via |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
978 # disabling access for anonymous users. |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
979 # Major re-org of the htmltemplate code, cleaning it up significantly. Fixed |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
980 # a couple of bugs while I was there. Probably introduced a couple, but |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
981 # things seem to work OK at the moment. |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
982 # |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
983 # Revision 1.38 2001/10/22 03:25:01 richard |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
984 # Added configuration for: |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
985 # . anonymous user access and registration (deny/allow) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
986 # . filter "widget" location on index page (top, bottom, both) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
987 # Updated some documentation. |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
988 # |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
989 # Revision 1.37 2001/10/21 07:26:35 richard |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
990 # feature #473127: Filenames. I modified the file.index and htmltemplate |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
991 # source so that the filename is used in the link and the creation |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
992 # information is displayed. |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
993 # |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
994 # Revision 1.36 2001/10/21 04:44:50 richard |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
995 # bug #473124: UI inconsistency with Link fields. |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
996 # This also prompted me to fix a fairly long-standing usability issue - |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
997 # that of being able to turn off certain filters. |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
998 # |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
999 # Revision 1.35 2001/10/21 00:17:54 richard |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
1000 # CGI interface view customisation section may now be hidden (patch from |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
1001 # Roch'e Compaan.) |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
1002 # |
|
307
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
1003 # Revision 1.34 2001/10/20 11:58:48 richard |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
1004 # Catch errors in login - no username or password supplied. |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
1005 # Fixed editing of password (Password property type) thanks Roch'e Compaan. |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
1006 # |
|
302
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
1007 # Revision 1.33 2001/10/17 00:18:41 richard |
|
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
1008 # Manually constructing cookie headers now. |
|
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
1009 # |
|
295
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
1010 # Revision 1.32 2001/10/16 03:36:21 richard |
|
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
1011 # CGI interface wasn't handling checkboxes at all. |
|
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
1012 # |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
1013 # Revision 1.31 2001/10/14 10:55:00 richard |
|
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
1014 # Handle empty strings in HTML template Link function |
|
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
1015 # |
|
292
4340cdc694d4
Handle empty strings in HTML template Link function
Richard Jones <richard@users.sourceforge.net>
parents:
273
diff
changeset
|
1016 # Revision 1.30 2001/10/09 07:38:58 richard |
|
4340cdc694d4
Handle empty strings in HTML template Link function
Richard Jones <richard@users.sourceforge.net>
parents:
273
diff
changeset
|
1017 # Pushed the base code for the extended schema CGI interface back into the |
|
4340cdc694d4
Handle empty strings in HTML template Link function
Richard Jones <richard@users.sourceforge.net>
parents:
273
diff
changeset
|
1018 # code cgi_client module so that future updates will be less painful. |
|
4340cdc694d4
Handle empty strings in HTML template Link function
Richard Jones <richard@users.sourceforge.net>
parents:
273
diff
changeset
|
1019 # Also removed a debugging print statement from cgi_client. |
|
4340cdc694d4
Handle empty strings in HTML template Link function
Richard Jones <richard@users.sourceforge.net>
parents:
273
diff
changeset
|
1020 # |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
1021 # Revision 1.29 2001/10/09 07:25:59 richard |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
1022 # Added the Password property type. See "pydoc roundup.password" for |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
1023 # implementation details. Have updated some of the documentation too. |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
1024 # |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
1025 # Revision 1.28 2001/10/08 00:34:31 richard |
|
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
1026 # Change message was stuffing up for multilinks with no key property. |
|
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
1027 # |
|
267
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1028 # Revision 1.27 2001/10/05 02:23:24 richard |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1029 # . roundup-admin create now prompts for property info if none is supplied |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1030 # on the command-line. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1031 # . hyperdb Class getprops() method may now return only the mutable |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1032 # properties. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1033 # . Login now uses cookies, which makes it a whole lot more flexible. We can |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1034 # now support anonymous user access (read-only, unless there's an |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1035 # "anonymous" user, in which case write access is permitted). Login |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1036 # handling has been moved into cgi_client.Client.main() |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1037 # . The "extended" schema is now the default in roundup init. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1038 # . The schemas have had their page headings modified to cope with the new |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1039 # login handling. Existing installations should copy the interfaces.py |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1040 # file from the roundup lib directory to their instance home. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1041 # . Incorrectly had a Bizar Software copyright on the cgitb.py module from |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1042 # Ping - has been removed. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1043 # . Fixed a whole bunch of places in the CGI interface where we should have |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1044 # been returning Not Found instead of throwing an exception. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1045 # . Fixed a deviation from the spec: trying to modify the 'id' property of |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1046 # an item now throws an exception. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
1047 # |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
1048 # Revision 1.26 2001/09/12 08:31:42 richard |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
1049 # handle cases where mime type is not guessable |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
1050 # |
|
247
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
1051 # Revision 1.25 2001/08/29 05:30:49 richard |
|
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
1052 # change messages weren't being saved when there was no-one on the nosy list. |
|
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
1053 # |
|
238
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
1054 # Revision 1.24 2001/08/29 04:49:39 richard |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
1055 # didn't clean up fully after debugging :( |
|
b8cca914bb53
change messages weren't being saved when there was no-one on the nosy list.
Richard Jones <richard@users.sourceforge.net>
parents:
237
diff
changeset
|
1056 # |
|
237
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
1057 # Revision 1.23 2001/08/29 04:47:18 richard |
|
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
1058 # Fixed CGI client change messages so they actually include the properties |
|
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
1059 # changed (again). |
|
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
1060 # |
|
236
8827f5931ea8
Fixed CGI client change messages...
Richard Jones <richard@users.sourceforge.net>
parents:
232
diff
changeset
|
1061 # Revision 1.22 2001/08/17 00:08:10 richard |
|
8827f5931ea8
Fixed CGI client change messages...
Richard Jones <richard@users.sourceforge.net>
parents:
232
diff
changeset
|
1062 # reverted back to sending messages always regardless of who is doing the web |
|
8827f5931ea8
Fixed CGI client change messages...
Richard Jones <richard@users.sourceforge.net>
parents:
232
diff
changeset
|
1063 # edit. change notes weren't being saved. bleah. hackish. |
|
8827f5931ea8
Fixed CGI client change messages...
Richard Jones <richard@users.sourceforge.net>
parents:
232
diff
changeset
|
1064 # |
|
232
d3edb94047a5
reverted back to sending messages always...
Richard Jones <richard@users.sourceforge.net>
parents:
228
diff
changeset
|
1065 # Revision 1.21 2001/08/15 23:43:18 richard |
|
d3edb94047a5
reverted back to sending messages always...
Richard Jones <richard@users.sourceforge.net>
parents:
228
diff
changeset
|
1066 # Fixed some isFooTypes that I missed. |
|
d3edb94047a5
reverted back to sending messages always...
Richard Jones <richard@users.sourceforge.net>
parents:
228
diff
changeset
|
1067 # Refactored some code in the CGI code. |
|
d3edb94047a5
reverted back to sending messages always...
Richard Jones <richard@users.sourceforge.net>
parents:
228
diff
changeset
|
1068 # |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
1069 # Revision 1.20 2001/08/12 06:32:36 richard |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
1070 # using isinstance(blah, Foo) now instead of isFooType |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
1071 # |
|
224
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
1072 # Revision 1.19 2001/08/07 00:24:42 richard |
|
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
1073 # stupid typo |
|
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
1074 # |
| 214 | 1075 # Revision 1.18 2001/08/07 00:15:51 richard |
| 1076 # Added the copyright/license notice to (nearly) all files at request of | |
| 1077 # Bizar Software. | |
| 1078 # | |
|
213
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
1079 # Revision 1.17 2001/08/02 06:38:17 richard |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
1080 # Roundupdb now appends "mailing list" information to its messages which |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
1081 # include the e-mail address and web interface address. Templates may |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
1082 # override this in their db classes to include specific information (support |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
1083 # instructions, etc). |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
1084 # |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
1085 # Revision 1.16 2001/08/02 05:55:25 richard |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
1086 # Web edit messages aren't sent to the person who did the edit any more. No |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
1087 # message is generated if they are the only person on the nosy list. |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
1088 # |
|
186
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
1089 # Revision 1.15 2001/08/02 00:34:10 richard |
|
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
1090 # bleah syntax error |
|
61355a9483f4
Web edit messages aren't sent to the person who did the edit any more.
Richard Jones <richard@users.sourceforge.net>
parents:
181
diff
changeset
|
1091 # |
|
181
817750ead8d5
bleah syntax error
Richard Jones <richard@users.sourceforge.net>
parents:
178
diff
changeset
|
1092 # Revision 1.14 2001/08/02 00:26:16 richard |
|
817750ead8d5
bleah syntax error
Richard Jones <richard@users.sourceforge.net>
parents:
178
diff
changeset
|
1093 # Changed the order of the information in the message generated by web edits. |
|
817750ead8d5
bleah syntax error
Richard Jones <richard@users.sourceforge.net>
parents:
178
diff
changeset
|
1094 # |
|
178
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
1095 # Revision 1.13 2001/07/30 08:12:17 richard |
|
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
1096 # Added time logging and file uploading to the templates. |
|
1573a02b3254
Changed the order of the information in the message generated by web edits.
Richard Jones <richard@users.sourceforge.net>
parents:
167
diff
changeset
|
1097 # |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
1098 # Revision 1.12 2001/07/30 06:26:31 richard |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
1099 # Added some documentation on how the newblah works. |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
1100 # |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1101 # Revision 1.11 2001/07/30 06:17:45 richard |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1102 # Features: |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1103 # . Added ability for cgi newblah forms to indicate that the new node |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1104 # should be linked somewhere. |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1105 # Fixed: |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1106 # . Fixed the agument handling for the roundup-admin find command. |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1107 # . Fixed handling of summary when no note supplied for newblah. Again. |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1108 # . Fixed detection of no form in htmltemplate Field display. |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
1109 # |
|
162
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
1110 # Revision 1.10 2001/07/30 02:37:34 richard |
|
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
1111 # Temporary measure until we have decent schema migration... |
|
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
1112 # |
|
154
4fb5f59d8627
Temporary measure until we have decent schema migration...
Richard Jones <richard@users.sourceforge.net>
parents:
142
diff
changeset
|
1113 # Revision 1.9 2001/07/30 01:25:07 richard |
|
4fb5f59d8627
Temporary measure until we have decent schema migration...
Richard Jones <richard@users.sourceforge.net>
parents:
142
diff
changeset
|
1114 # Default implementation is now "classic" rather than "extended" as one would |
|
4fb5f59d8627
Temporary measure until we have decent schema migration...
Richard Jones <richard@users.sourceforge.net>
parents:
142
diff
changeset
|
1115 # expect. |
|
4fb5f59d8627
Temporary measure until we have decent schema migration...
Richard Jones <richard@users.sourceforge.net>
parents:
142
diff
changeset
|
1116 # |
|
142
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
1117 # Revision 1.8 2001/07/29 08:27:40 richard |
|
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
1118 # Fixed handling of passed-in values in form elements (ie. during a |
|
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
1119 # drill-down) |
|
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
1120 # |
|
128
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
1121 # Revision 1.7 2001/07/29 07:01:39 richard |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
1122 # Added vim command to all source so that we don't get no steenkin' tabs :) |
|
ce36f2962b94
Fixed handling of passed-in values in form elements (ie. during a drill-down)
Richard Jones <richard@users.sourceforge.net>
parents:
127
diff
changeset
|
1123 # |
|
127
0791d13baea7
Added vim command to all source so that we don't get no steenkin' tabs :)
Richard Jones <richard@users.sourceforge.net>
parents:
117
diff
changeset
|
1124 # Revision 1.6 2001/07/29 04:04:00 richard |
|
0791d13baea7
Added vim command to all source so that we don't get no steenkin' tabs :)
Richard Jones <richard@users.sourceforge.net>
parents:
117
diff
changeset
|
1125 # Moved some code around allowing for subclassing to change behaviour. |
|
0791d13baea7
Added vim command to all source so that we don't get no steenkin' tabs :)
Richard Jones <richard@users.sourceforge.net>
parents:
117
diff
changeset
|
1126 # |
|
117
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
1127 # Revision 1.5 2001/07/28 08:16:52 richard |
|
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
1128 # New issue form handles lack of note better now. |
|
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
1129 # |
|
115
8775d545f41e
New issue form handles lack of note better now.
Richard Jones <richard@users.sourceforge.net>
parents:
103
diff
changeset
|
1130 # Revision 1.4 2001/07/28 00:34:34 richard |
|
8775d545f41e
New issue form handles lack of note better now.
Richard Jones <richard@users.sourceforge.net>
parents:
103
diff
changeset
|
1131 # Fixed some non-string node ids. |
|
8775d545f41e
New issue form handles lack of note better now.
Richard Jones <richard@users.sourceforge.net>
parents:
103
diff
changeset
|
1132 # |
|
103
381016730332
Fixed some non-string node ids.
Richard Jones <richard@users.sourceforge.net>
parents:
31
diff
changeset
|
1133 # Revision 1.3 2001/07/23 03:56:30 richard |
|
381016730332
Fixed some non-string node ids.
Richard Jones <richard@users.sourceforge.net>
parents:
31
diff
changeset
|
1134 # oops, missed a config removal |
|
381016730332
Fixed some non-string node ids.
Richard Jones <richard@users.sourceforge.net>
parents:
31
diff
changeset
|
1135 # |
|
31
6eebdf2bf262
oops, missed a config removal
Richard Jones <richard@users.sourceforge.net>
parents:
26
diff
changeset
|
1136 # Revision 1.2 2001/07/22 12:09:32 richard |
|
6eebdf2bf262
oops, missed a config removal
Richard Jones <richard@users.sourceforge.net>
parents:
26
diff
changeset
|
1137 # Final commit of Grande Splite |
|
6eebdf2bf262
oops, missed a config removal
Richard Jones <richard@users.sourceforge.net>
parents:
26
diff
changeset
|
1138 # |
|
26
c7c14960f413
Final commit of Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
25
diff
changeset
|
1139 # Revision 1.1 2001/07/22 11:58:35 richard |
|
c7c14960f413
Final commit of Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
25
diff
changeset
|
1140 # More Grande Splite |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1141 # |
|
127
0791d13baea7
Added vim command to all source so that we don't get no steenkin' tabs :)
Richard Jones <richard@users.sourceforge.net>
parents:
117
diff
changeset
|
1142 # |
|
0791d13baea7
Added vim command to all source so that we don't get no steenkin' tabs :)
Richard Jones <richard@users.sourceforge.net>
parents:
117
diff
changeset
|
1143 # vim: set filetype=python ts=4 sw=4 et si |
