From: richard Date: Mon, 26 Nov 2001 23:00:53 +0000 (+0000) Subject: This config stuff is getting to be a real mess... X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42d892b634c5a93a66384f064162f9efe93ccd1d;p=roundup.git This config stuff is getting to be a real mess... git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@425 57a73879-2fb5-44c3-a270-3262357dd7e2 --- diff --git a/roundup/cgi_client.py b/roundup/cgi_client.py index 2976814..4b8c7c4 100644 --- a/roundup/cgi_client.py +++ b/roundup/cgi_client.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: cgi_client.py,v 1.64 2001-11-26 22:56:35 richard Exp $ +# $Id: cgi_client.py,v 1.65 2001-11-26 23:00:53 richard Exp $ __doc__ = """ WWW request handler (also used in the stand-alone server). @@ -104,7 +104,8 @@ class Client: style = open(os.path.join(self.TEMPLATES, 'style.css')).read() user_name = self.user or '' if self.user == 'admin': - admin_links = ' | Class List' + admin_links = ' | Class List' \ + ' | User List' else: admin_links = '' if self.user not in (None, 'anonymous'): @@ -284,7 +285,7 @@ class Client: cn = self.classname cl = self.db.classes[cn] self.pagehead(_('%(instancename)s: Index of %(classname)s')%{ - 'classname': cn, 'instancename': cl.INSTANCE_NAME}) + 'classname': cn, 'instancename': self.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') @@ -922,7 +923,8 @@ class ExtendedClient(Client): style = open(os.path.join(self.TEMPLATES, 'style.css')).read() user_name = self.user or '' if self.user == 'admin': - admin_links = ' | Class List' + admin_links = ' | Class List' \ + ' | User List' else: admin_links = '' if self.user not in (None, 'anonymous'): @@ -1038,6 +1040,9 @@ def parsePropsFromForm(db, cl, form, nodeid=0): # # $Log: not supported by cvs2svn $ +# Revision 1.64 2001/11/26 22:56:35 richard +# typo +# # Revision 1.63 2001/11/26 22:55:56 richard # Feature: # . Added INSTANCE_NAME to configuration - used in web and email to identify diff --git a/roundup/templates/classic/interfaces.py b/roundup/templates/classic/interfaces.py index bd64559..72c2cbb 100644 --- a/roundup/templates/classic/interfaces.py +++ b/roundup/templates/classic/interfaces.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: interfaces.py,v 1.8 2001-10-22 03:25:01 richard Exp $ +# $Id: interfaces.py,v 1.9 2001-11-26 23:00:53 richard Exp $ import instance_config from roundup import cgi_client, mailgw @@ -24,6 +24,7 @@ class Client(cgi_client.Client): ''' derives basic CGI implementation from the standard module, with any specific extensions ''' + INSTANCE_NAME = instance_config.INSTANCE_NAME TEMPLATES = instance_config.TEMPLATES FILTER_POSITION = instance_config.FILTER_POSITION ANONYMOUS_ACCESS = instance_config.ANONYMOUS_ACCESS @@ -33,12 +34,19 @@ class MailGW(mailgw.MailGW): ''' derives basic mail gateway implementation from the standard module, with any specific extensions ''' + INSTANCE_NAME = instance_config.INSTANCE_NAME ISSUE_TRACKER_EMAIL = instance_config.ISSUE_TRACKER_EMAIL ADMIN_EMAIL = instance_config.ADMIN_EMAIL MAILHOST = instance_config.MAILHOST # # $Log: not supported by cvs2svn $ +# Revision 1.8 2001/10/22 03:25:01 richard +# Added configuration for: +# . anonymous user access and registration (deny/allow) +# . filter "widget" location on index page (top, bottom, both) +# Updated some documentation. +# # Revision 1.7 2001/10/09 07:38:58 richard # Pushed the base code for the extended schema CGI interface back into the # code cgi_client module so that future updates will be less painful. diff --git a/roundup/templates/extended/interfaces.py b/roundup/templates/extended/interfaces.py index 3f2ac14..bfe9269 100644 --- a/roundup/templates/extended/interfaces.py +++ b/roundup/templates/extended/interfaces.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: interfaces.py,v 1.12 2001-10-22 03:25:01 richard Exp $ +# $Id: interfaces.py,v 1.13 2001-11-26 23:00:53 richard Exp $ import instance_config from roundup import cgi_client, mailgw @@ -24,6 +24,7 @@ class Client(cgi_client.ExtendedClient): ''' derives basic CGI implementation from the standard module, with any specific extensions ''' + INSTANCE_NAME = instance_config.INSTANCE_NAME TEMPLATES = instance_config.TEMPLATES FILTER_POSITION = instance_config.FILTER_POSITION ANONYMOUS_ACCESS = instance_config.ANONYMOUS_ACCESS @@ -33,12 +34,19 @@ class MailGW(mailgw.MailGW): ''' derives basic mail gateway implementation from the standard module, with any specific extensions ''' + INSTANCE_NAME = instance_config.INSTANCE_NAME ISSUE_TRACKER_EMAIL = instance_config.ISSUE_TRACKER_EMAIL ADMIN_EMAIL = instance_config.ADMIN_EMAIL MAILHOST = instance_config.MAILHOST # # $Log: not supported by cvs2svn $ +# Revision 1.12 2001/10/22 03:25:01 richard +# Added configuration for: +# . anonymous user access and registration (deny/allow) +# . filter "widget" location on index page (top, bottom, both) +# Updated some documentation. +# # Revision 1.11 2001/10/09 07:38:58 richard # Pushed the base code for the extended schema CGI interface back into the # code cgi_client module so that future updates will be less painful.