Mercurial > p > roundup > code
annotate roundup/cgi_client.py @ 324:1aabcbeff752
changes
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Tue, 23 Oct 2001 23:54:22 +0000 |
| parents | c4a5922ffb74 |
| children | 70aadd5fbc18 |
| 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 # |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
18 # $Id: cgi_client.py,v 1.41 2001-10-23 23:52:35 richard 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 |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
21 import base64, 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 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
55 def __init__(self, instance, out, env): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
56 self.instance = instance |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
57 self.out = out |
|
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.headers_done = 0 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
63 self.form = cgi.FieldStorage(environ=env) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
64 self.headers_done = 0 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
65 self.debug = 0 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
66 |
|
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
|
67 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
|
68 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
|
69 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
70 def header(self, headers={'Content-Type':'text/html'}): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
71 if not headers.has_key('Content-Type'): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
72 headers['Content-Type'] = 'text/html' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
73 for entry in headers.items(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
74 self.out.write('%s: %s\n'%entry) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
75 self.out.write('\n') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
76 self.headers_done = 1 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
77 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
78 def pagehead(self, title, message=None): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
79 url = self.env['SCRIPT_NAME'] + '/' #self.env.get('PATH_INFO', '/') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
80 machine = self.env['SERVER_NAME'] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
81 port = self.env['SERVER_PORT'] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
82 if port != '80': machine = machine + ':' + port |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
83 base = urlparse.urlunparse(('http', machine, url, None, None, None)) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
84 if message is not None: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
85 message = '<div class="system-msg">%s</div>'%message |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
86 else: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
87 message = '' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
88 style = open(os.path.join(self.TEMPLATES, 'style.css')).read() |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
89 if self.user is not None: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
90 userid = self.db.user.lookup(self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
91 user_info = '(login: <a href="user%s">%s</a>)'%(userid, self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
92 else: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
93 user_info = '' |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
94 self.write('''<html><head> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
95 <title>%s</title> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
96 <style type="text/css">%s</style> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
97 </head> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
98 <body bgcolor=#ffffff> |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
99 %s |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
100 <table width=100%% border=0 cellspacing=0 cellpadding=2> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
101 <tr class="location-bar"><td><big><strong>%s</strong></big> %s</td></tr> |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
102 </table> |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
103 '''%(title, style, message, title, user_info)) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
104 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
105 def pagefoot(self): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
106 if self.debug: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
107 self.write('<hr><small><dl>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
108 self.write('<dt><b>Path</b></dt>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
109 self.write('<dd>%s</dd>'%(', '.join(map(repr, self.split_path)))) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
110 keys = self.form.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
111 keys.sort() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
112 if keys: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
113 self.write('<dt><b>Form entries</b></dt>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
114 for k in self.form.keys(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
115 v = str(self.form[k].value) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
116 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
|
117 keys = self.env.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
118 keys.sort() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
119 self.write('<dt><b>CGI environment</b></dt>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
120 for k in keys: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
121 v = self.env[k] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
122 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
|
123 self.write('</dl></small>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
124 self.write('</body></html>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
125 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
126 def write(self, content): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
127 if not self.headers_done: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
128 self.header() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
129 self.out.write(content) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
130 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
131 def index_arg(self, arg): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
132 ''' 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
|
133 (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
|
134 single string (ie. manually constructed GET args) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
135 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
136 if self.form.has_key(arg): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
137 arg = self.form[arg] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
138 if type(arg) == type([]): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
139 return [arg.value for arg in arg] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
140 return arg.value.split(',') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
141 return [] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
142 |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
143 def index_filterspec(self, filter): |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
144 ''' 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
|
145 |
|
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
|
146 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
|
147 strings. |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
148 ''' |
|
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
|
149 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
|
150 # all the form args not starting with ':' are filters |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
151 filterspec = {} |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
152 for key in self.form.keys(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
153 if key[0] == ':': continue |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
154 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
|
155 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
|
156 prop = props[key] |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
157 value = self.form[key] |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
158 if (isinstance(prop, hyperdb.Link) or |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
159 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
|
160 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
|
161 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
|
162 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
|
163 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
|
164 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
|
165 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
|
166 filterspec[key] = l |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
167 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
|
168 filterspec[key] = value.value |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
169 return filterspec |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
170 |
|
307
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
171 def customization_widget(self): |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
172 ''' 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
|
173 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
|
174 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
|
175 ''' |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
176 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
|
177 visible = 1 |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
178 else: |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
179 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
|
180 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
|
181 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
|
182 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
|
183 |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
184 return visible |
|
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
185 |
|
117
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
186 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
|
187 default_index_group = ['priority'] |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
188 default_index_filter = ['status'] |
|
142
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
189 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
|
190 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
|
191 def index(self): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
192 ''' put up an index |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
193 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
194 self.classname = 'issue' |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
195 # 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
|
196 defaults = 1 |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
197 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
|
198 if self.form.has_key(key): |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
199 defaults = 0 |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
200 break |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
201 if defaults: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
202 # no info supplied - use the defaults |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
203 sort = self.default_index_sort |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
204 group = self.default_index_group |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
205 filter = self.default_index_filter |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
206 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
|
207 filterspec = self.default_index_filterspec |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
208 else: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
209 sort = self.index_arg(':sort') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
210 group = self.index_arg(':group') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
211 filter = self.index_arg(':filter') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
212 columns = self.index_arg(':columns') |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
213 filterspec = self.index_filterspec(filter) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
214 return self.list(columns=columns, filter=filter, group=group, |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
215 sort=sort, filterspec=filterspec) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
216 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
217 # XXX deviates from spec - loses the '+' (that's a reserved character |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
218 # in URLS |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
219 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
|
220 filterspec=None, show_customization=None): |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
221 ''' call the template index with the args |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
222 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
223 :sort - sort by prop name, optionally preceeded with '-' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
224 to give descending or nothing for ascending sorting. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
225 :group - group by prop name, optionally preceeded with '-' or |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
226 to sort in descending or nothing for ascending order. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
227 :filter - selects which props should be displayed in the filter |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
228 section. Default is all. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
229 :columns - selects the columns that should be displayed. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
230 Default is all. |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
231 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
232 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
233 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
|
234 self.pagehead('Index of %s'%cn) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
235 if sort is None: sort = self.index_arg(':sort') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
236 if group is None: group = self.index_arg(':group') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
237 if filter is None: filter = self.index_arg(':filter') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
238 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
|
239 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
|
240 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
|
241 show_customization = self.customization_widget() |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
242 |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
243 index = htmltemplate.IndexTemplate(self, self.TEMPLATES, cn) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
244 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
|
245 show_customization=show_customization) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
246 self.pagefoot() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
247 |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
248 def shownode(self, message=None): |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
249 ''' display an item |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
250 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
251 cn = self.classname |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
252 cl = self.db.classes[cn] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
253 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
254 # possibly perform an edit |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
255 keys = self.form.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
256 num_re = re.compile('^\d+$') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
257 if keys: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
258 try: |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
259 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
|
260 self.nodeid) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
261 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
|
262 self._post_editnode(self.nodeid, changed) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
263 # and some nice feedback for the user |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
264 message = '%s edited ok'%', '.join(changed) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
265 except: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
266 s = StringIO.StringIO() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
267 traceback.print_exc(None, s) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
268 message = '<pre>%s</pre>'%cgi.escape(s.getvalue()) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
269 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
270 # now the display |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
271 id = self.nodeid |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
272 if cl.getkey(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
273 id = cl.get(id, cl.getkey()) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
274 self.pagehead('%s: %s'%(self.classname.capitalize(), id), message) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
275 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
276 nodeid = self.nodeid |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
277 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
278 # 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
|
279 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
|
280 item.render(nodeid) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
281 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
282 self.pagefoot() |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
283 showissue = shownode |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
284 showmsg = shownode |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
285 |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
286 def showuser(self, message=None): |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
287 ''' display an item |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
288 ''' |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
289 if self.user in ('admin', self.db.user.get(self.nodeid, 'username')): |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
290 self.shownode(message) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
291 else: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
292 raise Unauthorised |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
293 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
294 def showfile(self): |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
295 ''' display a file |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
296 ''' |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
297 nodeid = self.nodeid |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
298 cl = self.db.file |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
299 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
|
300 if type == 'message/rfc822': |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
301 type = 'text/plain' |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
302 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
|
303 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
|
304 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
305 def _createnode(self): |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
306 ''' 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
|
307 ''' |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
308 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
|
309 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
|
310 return cl.create(**props) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
311 |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
312 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
|
313 ''' 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
|
314 ''' |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
315 cn = self.classname |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
316 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
|
317 # link if necessary |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
318 keys = self.form.keys() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
319 for key in keys: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
320 if key == ':multilink': |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
321 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
|
322 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
|
323 for value in value: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
324 designator, property = value.split(':') |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
325 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
|
326 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
|
327 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
|
328 value.append(nid) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
329 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
|
330 elif key == ':link': |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
331 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
|
332 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
|
333 for value in value: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
334 designator, property = value.split(':') |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
335 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
|
336 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
|
337 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
|
338 |
|
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
|
339 # 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
|
340 # 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
|
341 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
|
342 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
|
343 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
|
344 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
|
345 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
|
346 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
|
347 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
|
348 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
|
349 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
|
350 |
|
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
|
351 # 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
|
352 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
|
353 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
|
354 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
|
355 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
|
356 summary = note |
|
181
817750ead8d5
bleah syntax error
Richard Jones <richard@users.sourceforge.net>
parents:
178
diff
changeset
|
357 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
|
358 else: |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
359 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
|
360 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
|
361 |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
362 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
|
363 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
|
364 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
|
365 if first: |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
366 m.append('\n-------') |
|
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
367 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
|
368 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
|
369 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
|
370 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
|
371 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
|
372 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
|
373 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
|
374 else: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
375 value = '-' |
|
224
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
376 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
|
377 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
|
378 l = [] |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
379 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
|
380 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
|
381 for entry in value: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
382 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
|
383 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
|
384 else: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
385 l.append(entry) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
386 value = ', '.join(l) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
387 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
|
388 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
389 # now create the message |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
390 content = '\n'.join(m) |
|
237
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
391 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
|
392 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
|
393 content=content) |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
394 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
|
395 messages.append(message_id) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
396 props = {'messages': messages} |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
397 cl.set(nid, **props) |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
398 |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
399 def newnode(self, message=None): |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
400 ''' 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
|
401 |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
402 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
|
403 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
|
404 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
|
405 submission fails. |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
406 |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
407 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
|
408 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
|
409 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
|
410 |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
411 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
|
412 (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
|
413 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
|
414 form entries: |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
415 :link=designator:property |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
416 :multilink=designator:property |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
417 ... 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
|
418 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
|
419 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
|
420 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
421 cn = self.classname |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
422 cl = self.db.classes[cn] |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
423 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
424 # possibly perform a create |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
425 keys = self.form.keys() |
|
162
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
426 if [i for i in keys if i[0] != ':']: |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
427 props = {} |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
428 try: |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
429 nid = self._createnode() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
430 self._post_editnode(nid) |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
431 # and some nice feedback for the user |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
432 message = '%s created ok'%cn |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
433 except: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
434 s = StringIO.StringIO() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
435 traceback.print_exc(None, s) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
436 message = '<pre>%s</pre>'%cgi.escape(s.getvalue()) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
437 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
|
438 |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
439 # call the template |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
440 newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES, |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
441 self.classname) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
442 newitem.render(self.form) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
443 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
444 self.pagefoot() |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
445 newissue = newnode |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
446 newuser = newnode |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
447 |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
448 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
|
449 ''' 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
|
450 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
451 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
|
452 file upload. |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
453 ''' |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
454 cn = self.classname |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
455 cl = self.db.classes[cn] |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
456 |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
457 # possibly perform a create |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
458 keys = self.form.keys() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
459 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
|
460 try: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
461 file = self.form['content'] |
|
247
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
462 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
|
463 if not type: |
|
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
464 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
|
465 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
|
466 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
|
467 # 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
|
468 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
|
469 except: |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
470 s = StringIO.StringIO() |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
471 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
|
472 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
|
473 |
|
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
474 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
|
475 newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES, |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
476 self.classname) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
477 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
|
478 self.pagefoot() |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
479 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
480 def classes(self, message=None): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
481 ''' display a list of all the classes in the database |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
482 ''' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
483 if self.user == 'admin': |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
484 self.pagehead('Table of classes', message) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
485 classnames = self.db.classes.keys() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
486 classnames.sort() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
487 self.write('<table border=0 cellspacing=0 cellpadding=2>\n') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
488 for cn in classnames: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
489 cl = self.db.getclass(cn) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
490 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
|
491 for key, value in cl.properties.items(): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
492 if value is None: value = '' |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
493 else: value = str(value) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
494 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
|
495 key, cgi.escape(value))) |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
496 self.write('</table>') |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
497 self.pagefoot() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
498 else: |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
499 raise Unauthorised |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
500 |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
501 def login(self, message=None): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
502 self.pagehead('Login to roundup', message) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
503 self.write(''' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
504 <table> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
505 <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
|
506 <form action="login_action" method=POST> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
507 <tr><td align=right>Login name: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
508 <td><input name="__login_name"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
509 <tr><td align=right>Password: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
510 <td><input type="password" name="__login_password"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
511 <tr><td></td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
512 <td><input type="submit" value="Log In"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
513 </form> |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
514 ''') |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
515 if self.user is None and self.ANONYMOUS_REGISTER == 'deny': |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
516 self.write('</table') |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
517 return |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
518 self.write(''' |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
519 <p> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
520 <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
|
521 <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
|
522 <form action="newuser_action" method=POST> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
523 <tr><td align=right><em>Name: </em></td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
524 <td><input name="__newuser_realname"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
525 <tr><td align=right><em>Organisation: </em></td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
526 <td><input name="__newuser_organisation"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
527 <tr><td align=right>E-Mail Address: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
528 <td><input name="__newuser_address"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
529 <tr><td align=right><em>Phone: </em></td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
530 <td><input name="__newuser_phone"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
531 <tr><td align=right>Preferred Login name: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
532 <td><input name="__newuser_username"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
533 <tr><td align=right>Password: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
534 <td><input type="password" name="__newuser_password"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
535 <tr><td align=right>Password Again: </td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
536 <td><input type="password" name="__newuser_confirm"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
537 <tr><td></td> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
538 <td><input type="submit" value="Register"></td></tr> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
539 </form> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
540 </table> |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
541 ''') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
542 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
543 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
|
544 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
|
545 return self.login(message='Username required') |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
546 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
|
547 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
|
548 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
|
549 else: |
|
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
550 password = '' |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
551 print self.user, password |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
552 # make sure the user exists |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
553 try: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
554 uid = self.db.user.lookup(self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
555 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
556 name = self.user |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
557 self.make_user_anonymous() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
558 return self.login(message='No such user "%s"'%name) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
559 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
560 # and that the password is correct |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
561 pw = self.db.user.get(uid, 'password') |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
562 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
|
563 self.make_user_anonymous() |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
564 return self.login(message='Incorrect password') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
565 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
566 # construct the cookie |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
567 uid = self.db.user.lookup(self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
568 user = base64.encodestring('%s:%s'%(self.user, password))[:-1] |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
569 path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME'], |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
570 '')) |
|
295
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
571 self.header({'Set-Cookie': 'roundup_user=%s; Path=%s;'%(user, path)}) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
572 return self.index() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
573 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
574 def make_user_anonymous(self): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
575 # make us anonymous if we can |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
576 try: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
577 self.db.user.lookup('anonymous') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
578 self.user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
579 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
580 self.user = None |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
581 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
582 def logout(self, message=None): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
583 self.make_user_anonymous() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
584 # construct the logout cookie |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
585 path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME'], |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
586 '')) |
|
295
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
587 now = Cookie._getdate() |
|
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
588 self.header({'Set-Cookie': |
|
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
589 'roundup_user=deleted; Max-Age=0; expires=%s; Path=%s;'%(now, 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
|
590 return self.login() |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
591 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
592 def newuser_action(self, message=None): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
593 ''' 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
|
594 set the cookie |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
595 ''' |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
596 # re-open the database as "admin" |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
597 self.db.close() |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
598 self.db = self.instance.open('admin') |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
599 |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
600 # TODO: pre-check the required fields and username key property |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
601 cl = self.db.classes['user'] |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
602 props, dummy = parsePropsFromForm(self.db, cl, self.form) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
603 uid = cl.create(**props) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
604 self.user = self.db.user.get(uid, 'username') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
605 password = self.db.user.get(uid, 'password') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
606 # construct the cookie |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
607 uid = self.db.user.lookup(self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
608 user = base64.encodestring('%s:%s'%(self.user, password))[:-1] |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
609 path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME'], |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
610 '')) |
|
295
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
611 self.header({'Set-Cookie': 'roundup_user=%s; Path=%s;'%(user, path)}) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
612 return self.index() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
613 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
614 def main(self, dre=re.compile(r'([^\d]+)(\d+)'), |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
615 nre=re.compile(r'new(\w+)')): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
616 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
617 # determine the uid to use |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
618 self.db = self.instance.open('admin') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
619 cookie = Cookie.Cookie(self.env.get('HTTP_COOKIE', '')) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
620 user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
621 if (cookie.has_key('roundup_user') and |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
622 cookie['roundup_user'].value != 'deleted'): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
623 cookie = cookie['roundup_user'].value |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
624 user, password = base64.decodestring(cookie).split(':') |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
625 # make sure the user exists |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
626 try: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
627 uid = self.db.user.lookup(user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
628 # now validate the password |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
629 if password != self.db.user.get(uid, 'password'): |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
630 user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
631 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
632 user = 'anonymous' |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
633 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
634 # 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
|
635 if user == 'anonymous': |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
636 self.make_user_anonymous() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
637 else: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
638 self.user = user |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
639 self.db.close() |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
640 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
641 # re-open the database for real, using the user |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
642 self.db = self.instance.open(self.user) |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
643 |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
644 # now figure which function to call |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
645 path = self.split_path |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
646 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
|
647 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
|
648 else: |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
649 action = path[0] |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
650 |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
651 # 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
|
652 # - 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
|
653 # 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
|
654 # 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
|
655 |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
656 # 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
|
657 if action == 'login_action': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
658 return self.login_action() |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
659 |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
660 # if we don't have a login and anonymous people aren't allowed to |
|
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
661 # register, then spit up the login form |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
662 if self.ANONYMOUS_REGISTER == 'deny' and self.user is None: |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
663 return self.login() |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
664 |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
665 # allow anonymous people to register |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
666 if action == 'newuser_action': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
667 return self.newuser_action() |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
668 |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
669 # make sure totally anonymous access is OK |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
670 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
|
671 return self.login() |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
672 |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
673 # 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
|
674 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
|
675 return self.index() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
676 if action == 'list_classes': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
677 return self.classes() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
678 if action == 'login': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
679 return self.login() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
680 if action == 'logout': |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
681 return self.logout() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
682 m = dre.match(action) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
683 if m: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
684 self.classname = m.group(1) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
685 self.nodeid = m.group(2) |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
686 try: |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
687 cl = self.db.classes[self.classname] |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
688 except KeyError: |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
689 raise NotFound |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
690 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
691 cl.get(self.nodeid, 'id') |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
692 except IndexError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
693 raise NotFound |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
694 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
695 func = getattr(self, 'show%s'%self.classname) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
696 except AttributeError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
697 raise NotFound |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
698 return func() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
699 m = nre.match(action) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
700 if m: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
701 self.classname = m.group(1) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
702 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
703 func = getattr(self, 'new%s'%self.classname) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
704 except AttributeError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
705 raise NotFound |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
706 return func() |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
707 self.classname = action |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
708 try: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
709 self.db.getclass(self.classname) |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
710 except KeyError: |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
711 raise NotFound |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
712 self.list() |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
713 |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
714 def __del__(self): |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
715 self.db.close() |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
716 |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
717 |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
718 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
|
719 '''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
|
720 extended schema. |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
721 ''' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
722 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
|
723 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
|
724 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
|
725 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
|
726 |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
727 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
|
728 default_index_group = ['priority'] |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
729 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
|
730 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
|
731 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
|
732 |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
733 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
|
734 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
|
735 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
|
736 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
|
737 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
|
738 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
|
739 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
|
740 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
|
741 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
742 message = '' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
743 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
|
744 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
|
745 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
|
746 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
|
747 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
748 admin_links = '' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
749 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
|
750 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
|
751 user_info = ''' |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
752 <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
|
753 <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
|
754 <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
|
755 '''%(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
|
756 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
757 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
|
758 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
|
759 add_links = ''' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
760 | Add |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
761 <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
|
762 <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
|
763 <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
|
764 ''' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
765 else: |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
766 add_links = '' |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
767 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
|
768 <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
|
769 <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
|
770 </head> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
771 <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
|
772 %s |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
773 <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
|
774 <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
|
775 <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
|
776 <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
|
777 <td align=left>All |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
778 <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
|
779 <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
|
780 | Unassigned |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
781 <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
|
782 <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
|
783 %s |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
784 %s</td> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
785 <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
|
786 </table> |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
787 '''%(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
|
788 user_info)) |
|
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
789 |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
790 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
|
791 '''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
|
792 ''' |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
793 props = {} |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
794 changed = [] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
795 keys = form.keys() |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
796 num_re = re.compile('^\d+$') |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
797 for key in keys: |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
798 if not cl.properties.has_key(key): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
799 continue |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
800 proptype = cl.properties[key] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
801 if isinstance(proptype, hyperdb.String): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
802 value = form[key].value.strip() |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
803 elif isinstance(proptype, hyperdb.Password): |
|
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
804 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
|
805 elif isinstance(proptype, hyperdb.Date): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
806 value = date.Date(form[key].value.strip()) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
807 elif isinstance(proptype, hyperdb.Interval): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
808 value = date.Interval(form[key].value.strip()) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
809 elif isinstance(proptype, hyperdb.Link): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
810 value = form[key].value.strip() |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
811 # 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
|
812 if value == '-1': |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
813 # don't set this property |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
814 continue |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
815 else: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
816 # handle key values |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
817 link = cl.properties[key].classname |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
818 if not num_re.match(value): |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
819 try: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
820 value = db.classes[link].lookup(value) |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
821 except KeyError: |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
822 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
|
823 key, value, link) |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
824 elif isinstance(proptype, hyperdb.Multilink): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
825 value = form[key] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
826 if type(value) != type([]): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
827 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
|
828 else: |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
829 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
|
830 link = cl.properties[key].classname |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
831 l = [] |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
832 for entry in map(str, value): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
833 if not num_re.match(entry): |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
834 try: |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
835 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
|
836 except KeyError: |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
837 raise ValueError, \ |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
838 '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
|
839 entry, link.capitalize()) |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
840 l.append(entry) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
841 l.sort() |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
842 value = l |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
843 props[key] = value |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
844 # if changed, set it |
|
236
8827f5931ea8
Fixed CGI client change messages...
Richard Jones <richard@users.sourceforge.net>
parents:
232
diff
changeset
|
845 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
|
846 changed.append(key) |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
847 props[key] = value |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
848 return props, changed |
|
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
849 |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
850 # |
|
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
851 # $Log: not supported by cvs2svn $ |
|
323
c4a5922ffb74
Fixed lock-out logic, thanks Roch'e for pointing out the problems.
Richard Jones <richard@users.sourceforge.net>
parents:
322
diff
changeset
|
852 # 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
|
853 # 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
|
854 # |
|
322
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
855 # Revision 1.39 2001/10/23 01:00:18 richard |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
856 # Re-enabled login and registration access after lopping them off via |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
857 # disabling access for anonymous users. |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
858 # 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
|
859 # 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
|
860 # things seem to work OK at the moment. |
|
62f5f2c404ec
Some cleanup.
Richard Jones <richard@users.sourceforge.net>
parents:
318
diff
changeset
|
861 # |
|
318
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
862 # 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
|
863 # Added configuration for: |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
864 # . anonymous user access and registration (deny/allow) |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
865 # . 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
|
866 # Updated some documentation. |
|
e18dd7227780
Re-enabled login and registration access...
Richard Jones <richard@users.sourceforge.net>
parents:
316
diff
changeset
|
867 # |
|
316
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
868 # Revision 1.37 2001/10/21 07:26:35 richard |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
869 # feature #473127: Filenames. I modified the file.index and htmltemplate |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
870 # 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
|
871 # information is displayed. |
|
c0ca7f35e0c5
Added configuration for:
Richard Jones <richard@users.sourceforge.net>
parents:
313
diff
changeset
|
872 # |
|
313
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
873 # 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
|
874 # bug #473124: UI inconsistency with Link fields. |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
875 # 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
|
876 # that of being able to turn off certain filters. |
|
489b70c37f32
feature [SF#473127]: Filenames.
Richard Jones <richard@users.sourceforge.net>
parents:
312
diff
changeset
|
877 # |
|
312
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
878 # 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
|
879 # 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
|
880 # Roch'e Compaan.) |
|
5a2c43891c20
[SF#473124]: UI inconsistency with Link fields.
Richard Jones <richard@users.sourceforge.net>
parents:
307
diff
changeset
|
881 # |
|
307
dac78e092228
CGI interface view customisation section may now be hidden
Richard Jones <richard@users.sourceforge.net>
parents:
302
diff
changeset
|
882 # 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
|
883 # 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
|
884 # 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
|
885 # |
|
302
d1fb3fcdb11b
Catch errors in login - no username or password supplied.
Richard Jones <richard@users.sourceforge.net>
parents:
295
diff
changeset
|
886 # 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
|
887 # 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
|
888 # |
|
295
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
889 # 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
|
890 # CGI interface wasn't handling checkboxes at all. |
|
0eb026a5257d
Manually constructing cookie headers now.
Richard Jones <richard@users.sourceforge.net>
parents:
293
diff
changeset
|
891 # |
|
293
956a9a86217b
CGI interface wasn't handling checkboxes at all.
Richard Jones <richard@users.sourceforge.net>
parents:
292
diff
changeset
|
892 # 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
|
893 # 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
|
894 # |
|
292
4340cdc694d4
Handle empty strings in HTML template Link function
Richard Jones <richard@users.sourceforge.net>
parents:
273
diff
changeset
|
895 # 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
|
896 # 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
|
897 # 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
|
898 # 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
|
899 # |
|
273
45e32247aa33
Pushed the base code for the extended schema CGI interface back...
Richard Jones <richard@users.sourceforge.net>
parents:
270
diff
changeset
|
900 # 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
|
901 # 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
|
902 # 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
|
903 # |
|
270
a4241ddd22d7
Added the Password property type.
Richard Jones <richard@users.sourceforge.net>
parents:
267
diff
changeset
|
904 # 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
|
905 # 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
|
906 # |
|
267
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
907 # 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
|
908 # . 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
|
909 # 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
|
910 # . 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
|
911 # properties. |
|
ee5e1436ac91
Change message was stuffing up for multilinks with no key property.
Richard Jones <richard@users.sourceforge.net>
parents:
264
diff
changeset
|
912 # . 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
|
913 # 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
|
914 # "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
|
915 # 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
|
916 # . 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
|
917 # . 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
|
918 # 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
|
919 # 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
|
920 # . 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
|
921 # 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
|
922 # . 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
|
923 # 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
|
924 # . 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
|
925 # 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
|
926 # |
|
264
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
927 # 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
|
928 # handle cases where mime type is not guessable |
|
a671e5917b33
Many features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
247
diff
changeset
|
929 # |
|
247
6aae5aaeab27
handle cases where mime type is not guessable
Richard Jones <richard@users.sourceforge.net>
parents:
238
diff
changeset
|
930 # 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
|
931 # 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
|
932 # |
|
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
|
933 # 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
|
934 # 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
|
935 # |
|
237
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
936 # 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
|
937 # 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
|
938 # changed (again). |
|
9ccdd87dc4d3
didn't clean up fully after debugging :(
Richard Jones <richard@users.sourceforge.net>
parents:
236
diff
changeset
|
939 # |
|
236
8827f5931ea8
Fixed CGI client change messages...
Richard Jones <richard@users.sourceforge.net>
parents:
232
diff
changeset
|
940 # 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
|
941 # 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
|
942 # 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
|
943 # |
|
232
d3edb94047a5
reverted back to sending messages always...
Richard Jones <richard@users.sourceforge.net>
parents:
228
diff
changeset
|
944 # 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
|
945 # Fixed some isFooTypes that I missed. |
|
d3edb94047a5
reverted back to sending messages always...
Richard Jones <richard@users.sourceforge.net>
parents:
228
diff
changeset
|
946 # Refactored some code in the CGI code. |
|
d3edb94047a5
reverted back to sending messages always...
Richard Jones <richard@users.sourceforge.net>
parents:
228
diff
changeset
|
947 # |
|
228
1d1848c99abe
Fixed some isFooTypes that I missed.
Richard Jones <richard@users.sourceforge.net>
parents:
224
diff
changeset
|
948 # 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
|
949 # 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
|
950 # |
|
224
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
951 # 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
|
952 # stupid typo |
|
ad2c98faec97
using isinstance(blah, Foo) now instead of isFooType
Richard Jones <richard@users.sourceforge.net>
parents:
214
diff
changeset
|
953 # |
| 214 | 954 # Revision 1.18 2001/08/07 00:15:51 richard |
| 955 # Added the copyright/license notice to (nearly) all files at request of | |
| 956 # Bizar Software. | |
| 957 # | |
|
213
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
958 # 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
|
959 # 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
|
960 # 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
|
961 # 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
|
962 # instructions, etc). |
|
d45384bc6420
Added the copyright/license notice to (nearly) all files...
Richard Jones <richard@users.sourceforge.net>
parents:
188
diff
changeset
|
963 # |
|
188
1536be43d2fa
Roundupdb now appends "mailing list" information to its messages...
Richard Jones <richard@users.sourceforge.net>
parents:
186
diff
changeset
|
964 # 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
|
965 # 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
|
966 # 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
|
967 # |
|
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
|
968 # 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
|
969 # 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
|
970 # |
|
181
817750ead8d5
bleah syntax error
Richard Jones <richard@users.sourceforge.net>
parents:
178
diff
changeset
|
971 # Revision 1.14 2001/08/02 00:26:16 richard |
|
817750ead8d5
bleah syntax error
Richard Jones <richard@users.sourceforge.net>
parents:
178
diff
changeset
|
972 # 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
|
973 # |
|
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
|
974 # 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
|
975 # 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
|
976 # |
|
167
a49c8a2ddd26
Added time logging and file uploading to the templates.
Richard Jones <richard@users.sourceforge.net>
parents:
163
diff
changeset
|
977 # 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
|
978 # 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
|
979 # |
|
163
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
980 # 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
|
981 # Features: |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
982 # . 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
|
983 # should be linked somewhere. |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
984 # Fixed: |
|
8f9a65510139
Added some documentation on how the newblah works.
Richard Jones <richard@users.sourceforge.net>
parents:
162
diff
changeset
|
985 # . 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
|
986 # . 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
|
987 # . 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
|
988 # |
|
162
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
989 # Revision 1.10 2001/07/30 02:37:34 richard |
|
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
990 # Temporary measure until we have decent schema migration... |
|
717f12e6ccf2
Features and fixes.
Richard Jones <richard@users.sourceforge.net>
parents:
154
diff
changeset
|
991 # |
|
154
4fb5f59d8627
Temporary measure until we have decent schema migration...
Richard Jones <richard@users.sourceforge.net>
parents:
142
diff
changeset
|
992 # 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
|
993 # 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
|
994 # expect. |
|
4fb5f59d8627
Temporary measure until we have decent schema migration...
Richard Jones <richard@users.sourceforge.net>
parents:
142
diff
changeset
|
995 # |
|
142
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
996 # 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
|
997 # 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
|
998 # drill-down) |
|
664faa54d672
Default implementation is now "classic"...
Richard Jones <richard@users.sourceforge.net>
parents:
128
diff
changeset
|
999 # |
|
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
|
1000 # 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
|
1001 # 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
|
1002 # |
|
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
|
1003 # 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
|
1004 # 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
|
1005 # |
|
117
63de7e04c74d
Moved some code around allowing for subclassing to change behaviour.
Richard Jones <richard@users.sourceforge.net>
parents:
115
diff
changeset
|
1006 # 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
|
1007 # 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
|
1008 # |
|
115
8775d545f41e
New issue form handles lack of note better now.
Richard Jones <richard@users.sourceforge.net>
parents:
103
diff
changeset
|
1009 # 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
|
1010 # 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
|
1011 # |
|
103
381016730332
Fixed some non-string node ids.
Richard Jones <richard@users.sourceforge.net>
parents:
31
diff
changeset
|
1012 # 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
|
1013 # oops, missed a config removal |
|
381016730332
Fixed some non-string node ids.
Richard Jones <richard@users.sourceforge.net>
parents:
31
diff
changeset
|
1014 # |
|
31
6eebdf2bf262
oops, missed a config removal
Richard Jones <richard@users.sourceforge.net>
parents:
26
diff
changeset
|
1015 # 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
|
1016 # Final commit of Grande Splite |
|
6eebdf2bf262
oops, missed a config removal
Richard Jones <richard@users.sourceforge.net>
parents:
26
diff
changeset
|
1017 # |
|
26
c7c14960f413
Final commit of Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
25
diff
changeset
|
1018 # 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
|
1019 # More Grande Splite |
|
25
4cf1daf2f2eb
More Grande Splite
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1020 # |
|
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
|
1021 # |
|
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
|
1022 # vim: set filetype=python ts=4 sw=4 et si |
