diff --git a/roundup/cgi_client.py b/roundup/cgi_client.py
index 5a866cb891caa607e921e00971e2828d7f50b02d..aea9d1d13ee74a57e5b5290944dae517a3190e54 100644 (file)
--- a/roundup/cgi_client.py
+++ b/roundup/cgi_client.py
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#
-# $Id: cgi_client.py,v 1.95 2002-01-10 03:39:45 richard Exp $
+# $Id: cgi_client.py,v 1.100 2002-01-16 07:02:57 richard Exp $
__doc__ = """
WWW request handler (also used in the stand-alone server).
__doc__ = """
WWW request handler (also used in the stand-alone server).
'anonymous' user exists, the user is logged in using that user (though
there is no cookie). This allows them to modify the database, and all
modifications are attributed to the 'anonymous' user.
'anonymous' user exists, the user is logged in using that user (though
there is no cookie). This allows them to modify the database, and all
modifications are attributed to the 'anonymous' user.
-
-
- Customisation
- -------------
- FILTER_POSITION - one of 'top', 'bottom', 'top and bottom'
- ANONYMOUS_ACCESS - one of 'deny', 'allow'
- ANONYMOUS_REGISTER - one of 'deny', 'allow'
-
- from the roundup class:
- INSTANCE_NAME - defaults to 'Roundup issue tracker'
-
'''
'''
- FILTER_POSITION = 'bottom' # one of 'top', 'bottom', 'top and bottom'
- ANONYMOUS_ACCESS = 'deny' # one of 'deny', 'allow'
- ANONYMOUS_REGISTER = 'deny' # one of 'deny', 'allow'
def __init__(self, instance, request, env, form=None):
self.instance = instance
def __init__(self, instance, request, env, form=None):
self.instance = instance
message = _('<div class="system-msg">%(message)s</div>')%locals()
else:
message = ''
message = _('<div class="system-msg">%(message)s</div>')%locals()
else:
message = ''
- style = open(os.path.join(self.TEMPLATES, 'style.css')).read()
+ style = open(os.path.join(self.instance.TEMPLATES, 'style.css')).read()
user_name = self.user or ''
if self.user == 'admin':
admin_links = _(' | <a href="list_classes">Class List</a>' \
user_name = self.user or ''
if self.user == 'admin':
admin_links = _(' | <a href="list_classes">Class List</a>' \
cn = self.classname
cl = self.db.classes[cn]
self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
cn = self.classname
cl = self.db.classes[cn]
self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
- 'classname': cn, 'instancename': self.INSTANCE_NAME})
+ 'classname': cn, 'instancename': self.instance.INSTANCE_NAME})
if sort is None: sort = self.index_arg(':sort')
if group is None: group = self.index_arg(':group')
if filter is None: filter = self.index_arg(':filter')
if sort is None: sort = self.index_arg(':sort')
if group is None: group = self.index_arg(':group')
if filter is None: filter = self.index_arg(':filter')
if show_customization is None:
show_customization = self.customization_widget()
if show_customization is None:
show_customization = self.customization_widget()
- index = htmltemplate.IndexTemplate(self, self.TEMPLATES, cn)
+ index = htmltemplate.IndexTemplate(self, self.instance.TEMPLATES, cn)
index.render(filterspec, filter, columns, sort, group,
show_customization=show_customization)
self.pagefoot()
index.render(filterspec, filter, columns, sort, group,
show_customization=show_customization)
self.pagefoot()
', '.join(props.keys())}
elif self.form.has_key('__note') and self.form['__note'].value:
message = _('note added')
', '.join(props.keys())}
elif self.form.has_key('__note') and self.form['__note'].value:
message = _('note added')
- elif self.form.has_key('__file'):
+ elif (self.form.has_key('__file') and
+ self.form['__file'].filename):
message = _('file added')
else:
message = _('nothing changed')
message = _('file added')
else:
message = _('nothing changed')
nodeid = self.nodeid
# use the template to display the item
nodeid = self.nodeid
# use the template to display the item
- item = htmltemplate.ItemTemplate(self, self.TEMPLATES, self.classname)
+ item = htmltemplate.ItemTemplate(self, self.instance.TEMPLATES,
+ self.classname)
item.render(nodeid)
self.pagefoot()
item.render(nodeid)
self.pagefoot()
return
assignedto_id = props['assignedto']
if not props.has_key('nosy'):
return
assignedto_id = props['assignedto']
if not props.has_key('nosy'):
- props['nosy'] = [assignedto_id]
- elif assignedto_id not in props['nosy']:
+ # load current nosy
+ if self.nodeid:
+ cl = self.db.classes[self.classname]
+ l = cl.get(self.nodeid, 'nosy')
+ if assignedto_id in l:
+ return
+ props['nosy'] = l
+ else:
+ props['nosy'] = []
+ if assignedto_id not in props['nosy']:
props['nosy'].append(assignedto_id)
def _changenode(self, props):
props['nosy'].append(assignedto_id)
def _changenode(self, props):
''' create a node based on the contents of the form
'''
cl = self.db.classes[self.classname]
''' create a node based on the contents of the form
'''
cl = self.db.classes[self.classname]
- props, dummy = parsePropsFromForm(self.db, cl, self.form)
+ props = parsePropsFromForm(self.db, cl, self.form)
# set status to 'unread' if not specified - a status of '- no
# selection -' doesn't make sense
# set status to 'unread' if not specified - a status of '- no
# selection -' doesn't make sense
return cl.create(**props)
def _handle_message(self):
return cl.create(**props)
def _handle_message(self):
- ''' generate and edit message
+ ''' generate an edit message
'''
# handle file attachments
files = []
'''
# handle file attachments
files = []
self.nodeid = nid
self.pagehead('%s: %s'%(self.classname.capitalize(), nid),
message)
self.nodeid = nid
self.pagehead('%s: %s'%(self.classname.capitalize(), nid),
message)
- item = htmltemplate.ItemTemplate(self, self.TEMPLATES,
+ item = htmltemplate.ItemTemplate(self, self.instance.TEMPLATES,
self.classname)
item.render(nid)
self.pagefoot()
self.classname)
item.render(nid)
self.pagefoot()
self.classname.capitalize()}, message)
# call the template
self.classname.capitalize()}, message)
# call the template
- newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+ newitem = htmltemplate.NewItemTemplate(self, self.instance.TEMPLATES,
self.classname)
newitem.render(self.form)
self.classname)
newitem.render(self.form)
if [i for i in keys if i[0] != ':']:
try:
props = parsePropsFromForm(self.db, cl, self.form)
if [i for i in keys if i[0] != ':']:
try:
props = parsePropsFromForm(self.db, cl, self.form)
- print props
nid = cl.create(**props)
# handle linked nodes
self._post_editnode(nid)
nid = cl.create(**props)
# handle linked nodes
self._post_editnode(nid)
self.classname.capitalize()}, message)
# call the template
self.classname.capitalize()}, message)
# call the template
- newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+ newitem = htmltemplate.NewItemTemplate(self, self.instance.TEMPLATES,
self.classname)
newitem.render(self.form)
self.classname)
newitem.render(self.form)
self.pagehead(_('New %(classname)s')%{'classname':
self.classname.capitalize()}, message)
self.pagehead(_('New %(classname)s')%{'classname':
self.classname.capitalize()}, message)
- newitem = htmltemplate.NewItemTemplate(self, self.TEMPLATES,
+ newitem = htmltemplate.NewItemTemplate(self, self.instance.TEMPLATES,
self.classname)
newitem.render(self.form)
self.pagefoot()
self.classname)
newitem.render(self.form)
self.pagefoot()
self.pagehead(_('User: %(user)s')%{'user': node_user}, message)
# use the template to display the item
self.pagehead(_('User: %(user)s')%{'user': node_user}, message)
# use the template to display the item
- item = htmltemplate.ItemTemplate(self, self.TEMPLATES, 'user')
+ item = htmltemplate.ItemTemplate(self, self.instance.TEMPLATES, 'user')
item.render(self.nodeid)
self.pagefoot()
item.render(self.nodeid)
self.pagefoot()
<td><input type="submit" value="Log In"></td></tr>
</form>
''')%locals())
<td><input type="submit" value="Log In"></td></tr>
</form>
''')%locals())
- if self.user is None and self.ANONYMOUS_REGISTER == 'deny':
+ if self.user is None and self.instance.ANONYMOUS_REGISTER == 'deny':
self.write('</table>')
self.pagefoot()
return
self.write('</table>')
self.pagefoot()
return
if action == 'newuser_action':
# if we don't have a login and anonymous people aren't allowed to
# register, then spit up the login form
if action == 'newuser_action':
# if we don't have a login and anonymous people aren't allowed to
# register, then spit up the login form
- if self.ANONYMOUS_REGISTER == 'deny' and self.user is None:
+ if self.instance.ANONYMOUS_REGISTER == 'deny' and self.user is None:
if action == 'login':
self.login() # go to the index after login
else:
if action == 'login':
self.login() # go to the index after login
else:
action = 'index'
# no login or registration, make sure totally anonymous access is OK
action = 'index'
# no login or registration, make sure totally anonymous access is OK
- elif self.ANONYMOUS_ACCESS == 'deny' and self.user is None:
+ elif self.instance.ANONYMOUS_ACCESS == 'deny' and self.user is None:
if action == 'login':
self.login() # go to the index after login
else:
if action == 'login':
self.login() # go to the index after login
else:
message = _('<div class="system-msg">%(message)s</div>')%locals()
else:
message = ''
message = _('<div class="system-msg">%(message)s</div>')%locals()
else:
message = ''
- style = open(os.path.join(self.TEMPLATES, 'style.css')).read()
+ style = open(os.path.join(self.instance.TEMPLATES, 'style.css')).read()
user_name = self.user or ''
if self.user == 'admin':
admin_links = _(' | <a href="list_classes">Class List</a>' \
user_name = self.user or ''
if self.user == 'admin':
admin_links = _(' | <a href="list_classes">Class List</a>' \
elif isinstance(proptype, hyperdb.Password):
value = password.Password(form[key].value.strip())
elif isinstance(proptype, hyperdb.Date):
elif isinstance(proptype, hyperdb.Password):
value = password.Password(form[key].value.strip())
elif isinstance(proptype, hyperdb.Date):
- value = date.Date(form[key].value.strip())
+ value = form[key].value.strip()
+ if value:
+ value = date.Date(form[key].value.strip())
+ else:
+ value = None
elif isinstance(proptype, hyperdb.Interval):
elif isinstance(proptype, hyperdb.Interval):
- value = date.Interval(form[key].value.strip())
+ value = form[key].value.strip()
+ if value:
+ value = date.Interval(form[key].value.strip())
+ else:
+ value = None
elif isinstance(proptype, hyperdb.Link):
value = form[key].value.strip()
# see if it's the "no selection" choice
elif isinstance(proptype, hyperdb.Link):
value = form[key].value.strip()
# see if it's the "no selection" choice
#
# $Log: not supported by cvs2svn $
#
# $Log: not supported by cvs2svn $
+# Revision 1.99 2002/01/16 03:02:42 richard
+# #503793 ] changing assignedto resets nosy list
+#
+# Revision 1.98 2002/01/14 02:20:14 richard
+# . changed all config accesses so they access either the instance or the
+# config attriubute on the db. This means that all config is obtained from
+# instance_config instead of the mish-mash of classes. This will make
+# switching to a ConfigParser setup easier too, I hope.
+#
+# At a minimum, this makes migration a _little_ easier (a lot easier in the
+# 0.5.0 switch, I hope!)
+#
+# Revision 1.97 2002/01/11 23:22:29 richard
+# . #502437 ] rogue reactor and unittest
+# in short, the nosy reactor was modifying the nosy list. That code had
+# been there for a long time, and I suspsect it was there because we
+# weren't generating the nosy list correctly in other places of the code.
+# We're now doing that, so the nosy-modifying code can go away from the
+# nosy reactor.
+#
+# Revision 1.96 2002/01/10 05:26:10 richard
+# missed a parsePropsFromForm in last update
+#
+# Revision 1.95 2002/01/10 03:39:45 richard
+# . fixed some problems with web editing and change detection
+#
# Revision 1.94 2002/01/09 13:54:21 grubert
# _add_assignedto_to_nosy did set nosy to assignedto only, no adding.
#
# Revision 1.94 2002/01/09 13:54:21 grubert
# _add_assignedto_to_nosy did set nosy to assignedto only, no adding.
#