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