Skip to content

Commit b9f61c1

Browse files
author
Richard Jones
committed
This config stuff is getting to be a real mess...
1 parent cd29360 commit b9f61c1

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

roundup/cgi_client.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: cgi_client.py,v 1.64 2001-11-26 22:56:35 richard Exp $
18+
# $Id: cgi_client.py,v 1.65 2001-11-26 23:00:53 richard Exp $
1919

2020
__doc__ = """
2121
WWW request handler (also used in the stand-alone server).
@@ -104,7 +104,8 @@ def pagehead(self, title, message=None):
104104
style = open(os.path.join(self.TEMPLATES, 'style.css')).read()
105105
user_name = self.user or ''
106106
if self.user == 'admin':
107-
admin_links = ' | <a href="list_classes">Class List</a>'
107+
admin_links = ' | <a href="list_classes">Class List</a>' \
108+
' | <a href="user">User List</a>'
108109
else:
109110
admin_links = ''
110111
if self.user not in (None, 'anonymous'):
@@ -284,7 +285,7 @@ def list(self, sort=None, group=None, filter=None, columns=None,
284285
cn = self.classname
285286
cl = self.db.classes[cn]
286287
self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
287-
'classname': cn, 'instancename': cl.INSTANCE_NAME})
288+
'classname': cn, 'instancename': self.INSTANCE_NAME})
288289
if sort is None: sort = self.index_arg(':sort')
289290
if group is None: group = self.index_arg(':group')
290291
if filter is None: filter = self.index_arg(':filter')
@@ -922,7 +923,8 @@ def pagehead(self, title, message=None):
922923
style = open(os.path.join(self.TEMPLATES, 'style.css')).read()
923924
user_name = self.user or ''
924925
if self.user == 'admin':
925-
admin_links = ' | <a href="list_classes">Class List</a>'
926+
admin_links = ' | <a href="list_classes">Class List</a>' \
927+
' | <a href="user">User List</a>'
926928
else:
927929
admin_links = ''
928930
if self.user not in (None, 'anonymous'):
@@ -1038,6 +1040,9 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
10381040

10391041
#
10401042
# $Log: not supported by cvs2svn $
1043+
# Revision 1.64 2001/11/26 22:56:35 richard
1044+
# typo
1045+
#
10411046
# Revision 1.63 2001/11/26 22:55:56 richard
10421047
# Feature:
10431048
# . Added INSTANCE_NAME to configuration - used in web and email to identify

roundup/templates/classic/interfaces.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: interfaces.py,v 1.8 2001-10-22 03:25:01 richard Exp $
18+
# $Id: interfaces.py,v 1.9 2001-11-26 23:00:53 richard Exp $
1919

2020
import instance_config
2121
from roundup import cgi_client, mailgw
@@ -24,6 +24,7 @@ class Client(cgi_client.Client):
2424
''' derives basic CGI implementation from the standard module,
2525
with any specific extensions
2626
'''
27+
INSTANCE_NAME = instance_config.INSTANCE_NAME
2728
TEMPLATES = instance_config.TEMPLATES
2829
FILTER_POSITION = instance_config.FILTER_POSITION
2930
ANONYMOUS_ACCESS = instance_config.ANONYMOUS_ACCESS
@@ -33,12 +34,19 @@ class MailGW(mailgw.MailGW):
3334
''' derives basic mail gateway implementation from the standard module,
3435
with any specific extensions
3536
'''
37+
INSTANCE_NAME = instance_config.INSTANCE_NAME
3638
ISSUE_TRACKER_EMAIL = instance_config.ISSUE_TRACKER_EMAIL
3739
ADMIN_EMAIL = instance_config.ADMIN_EMAIL
3840
MAILHOST = instance_config.MAILHOST
3941

4042
#
4143
# $Log: not supported by cvs2svn $
44+
# Revision 1.8 2001/10/22 03:25:01 richard
45+
# Added configuration for:
46+
# . anonymous user access and registration (deny/allow)
47+
# . filter "widget" location on index page (top, bottom, both)
48+
# Updated some documentation.
49+
#
4250
# Revision 1.7 2001/10/09 07:38:58 richard
4351
# Pushed the base code for the extended schema CGI interface back into the
4452
# code cgi_client module so that future updates will be less painful.

roundup/templates/extended/interfaces.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: interfaces.py,v 1.12 2001-10-22 03:25:01 richard Exp $
18+
# $Id: interfaces.py,v 1.13 2001-11-26 23:00:53 richard Exp $
1919

2020
import instance_config
2121
from roundup import cgi_client, mailgw
@@ -24,6 +24,7 @@ class Client(cgi_client.ExtendedClient):
2424
''' derives basic CGI implementation from the standard module,
2525
with any specific extensions
2626
'''
27+
INSTANCE_NAME = instance_config.INSTANCE_NAME
2728
TEMPLATES = instance_config.TEMPLATES
2829
FILTER_POSITION = instance_config.FILTER_POSITION
2930
ANONYMOUS_ACCESS = instance_config.ANONYMOUS_ACCESS
@@ -33,12 +34,19 @@ class MailGW(mailgw.MailGW):
3334
''' derives basic mail gateway implementation from the standard module,
3435
with any specific extensions
3536
'''
37+
INSTANCE_NAME = instance_config.INSTANCE_NAME
3638
ISSUE_TRACKER_EMAIL = instance_config.ISSUE_TRACKER_EMAIL
3739
ADMIN_EMAIL = instance_config.ADMIN_EMAIL
3840
MAILHOST = instance_config.MAILHOST
3941

4042
#
4143
# $Log: not supported by cvs2svn $
44+
# Revision 1.12 2001/10/22 03:25:01 richard
45+
# Added configuration for:
46+
# . anonymous user access and registration (deny/allow)
47+
# . filter "widget" location on index page (top, bottom, both)
48+
# Updated some documentation.
49+
#
4250
# Revision 1.11 2001/10/09 07:38:58 richard
4351
# Pushed the base code for the extended schema CGI interface back into the
4452
# code cgi_client module so that future updates will be less painful.

0 commit comments

Comments
 (0)