Skip to content

Z
Zope
Commit f7ce9f48 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Changed PARENT_URL to URL1.

parent 4957ab92
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
lib/python/AccessControl/User.py
View file @ f7ce9f48
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""Access control package""" """Access control package"""
__version__='$Revision: 1.67 $'[11:-2] __version__='$Revision: 1.68 $'[11:-2]
import Globals, App.Undo, socket, regex import Globals, App.Undo, socket, regex
from Globals import HTMLFile, MessageDialog, Persistent, PersistentMapping from Globals import HTMLFile, MessageDialog, Persistent, PersistentMapping
...@@ -676,7 +676,7 @@ def manage_addUserFolder(self,dtself=None,REQUEST=None,**ignored): ...@@ -676,7 +676,7 @@ def manage_addUserFolder(self,dtself=None,REQUEST=None,**ignored):
except: return MessageDialog( except: return MessageDialog(
title ='Item Exists', title ='Item Exists',
message='This object already contains a User Folder', message='This object already contains a User Folder',
action ='%s/manage_main' % REQUEST['PARENT_URL']) action ='%s/manage_main' % REQUEST['URL1'])
self.__allow_groups__=self.acl_users self.__allow_groups__=self.acl_users
if REQUEST: return self.manage_main(self,REQUEST,update_menu=1) if REQUEST: return self.manage_main(self,REQUEST,update_menu=1)
......
lib/python/DocumentTemplate/DT_HTML.py
View file @ f7ce9f48
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""HTML formated DocumentTemplates """HTML formated DocumentTemplates
$Id: DT_HTML.py,v 1.16 1999/03/18 15:07:03 brian Exp $""" $Id: DT_HTML.py,v 1.17 1999/03/22 23:18:56 jim Exp $"""
from DT_String import String, FileMixin from DT_String import String, FileMixin
import DT_String, regex import DT_String, regex
...@@ -222,14 +222,14 @@ class HTML(DT_String.String): ...@@ -222,14 +222,14 @@ class HTML(DT_String.String):
everything else private.''' everything else private.'''
return self return self
def manage_editForm(self, PARENT_URL, REQUEST): def manage_editForm(self, URL1, REQUEST):
'''Display doc template editing form''' #" '''Display doc template editing form''' #"
return self._manage_editForm( return self._manage_editForm(
self, self,
mapping=REQUEST, mapping=REQUEST,
__str__=str(self), __str__=str(self),
PARENT_URL=PARENT_URL URL1=URL1
) )
manage_editDocument=manage=manage_editForm manage_editDocument=manage=manage_editForm
...@@ -268,7 +268,7 @@ class HTMLFile(FileMixin, HTML): ...@@ -268,7 +268,7 @@ class HTMLFile(FileMixin, HTML):
self.cooked=self.cook() self.cooked=self.cook()
if REQUEST: return self.editConfirmation(self,REQUEST) if REQUEST: return self.editConfirmation(self,REQUEST)
def manage_editForm(self, PARENT_URL, REQUEST): def manage_editForm(self, URL1, REQUEST):
'''Display doc template editing form''' '''Display doc template editing form'''
return self._manage_editForm(mapping=REQUEST, return self._manage_editForm(mapping=REQUEST,
...@@ -280,7 +280,7 @@ class HTMLFile(FileMixin, HTML): ...@@ -280,7 +280,7 @@ class HTMLFile(FileMixin, HTML):
self.document_template_form_header, self.document_template_form_header,
document_template_edit_footer= document_template_edit_footer=
self.document_template_edit_footer, self.document_template_edit_footer,
PARENT_URL=PARENT_URL, URL1=URL1,
__str__=str(self), __str__=str(self),
FactoryDefaultString=FactoryDefaultString, FactoryDefaultString=FactoryDefaultString,
) )
......
lib/python/DocumentTemplate/DT_UI.py
View file @ f7ce9f48
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
__doc__='''Machinery to support through-the-web editing __doc__='''Machinery to support through-the-web editing
$Id: DT_UI.py,v 1.9 1999/03/10 00:15:07 klm Exp $''' $Id: DT_UI.py,v 1.10 1999/03/22 23:19:21 jim Exp $'''
__version__='$Revision: 1.9 $'[11:-2] __version__='$Revision: 1.10 $'[11:-2]
from DT_HTML import HTML from DT_HTML import HTML
...@@ -108,7 +108,7 @@ HTML._manage_editForm = HTML( ...@@ -108,7 +108,7 @@ HTML._manage_editForm = HTML(
<BODY bgcolor="#FFFFFF"> <BODY bgcolor="#FFFFFF">
<!--#var document_template_edit_header--> <!--#var document_template_edit_header-->
<FORM name="editform" ACTION="<!--#var PARENT_URL-->/manage_edit" METHOD="POST"> <FORM name="editform" ACTION="<!--#var URL1-->/manage_edit" METHOD="POST">
<!--#var document_template_form_header--> <!--#var document_template_form_header-->
Document template source: Document template source:
<center> <center>
...@@ -130,10 +130,10 @@ HTML._manage_editForm = HTML( ...@@ -130,10 +130,10 @@ HTML._manage_editForm = HTML(
<INPUT NAME="CANCEL_ACTION" TYPE="HIDDEN" <INPUT NAME="CANCEL_ACTION" TYPE="HIDDEN"
VALUE="<!--#var HTTP_REFERER-->"> VALUE="<!--#var HTTP_REFERER-->">
<!--#else HTTP_REFERER--> <!--#else HTTP_REFERER-->
<!--#if PARENT_URL--> <!--#if URL1-->
<INPUT NAME="CANCEL_ACTION" TYPE="HIDDEN" <INPUT NAME="CANCEL_ACTION" TYPE="HIDDEN"
VALUE="<!--#var PARENT_URL-->"> VALUE="<!--#var URL1-->">
<!--#/if PARENT_URL--> <!--#/if URL1-->
<!--#/if HTTP_REFERER--> <!--#/if HTTP_REFERER-->
</center> </center>
</FORM> </FORM>
......
lib/python/DocumentTemplate/DTtest.py
View file @ f7ce9f48
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
"""Document Template Tests """Document Template Tests
""" """
__rcs_id__='$Id: DTtest.py,v 1.11 1999/03/10 00:15:08 klm Exp $' __rcs_id__='$Id: DTtest.py,v 1.12 1999/03/22 23:19:42 jim Exp $'
__version__='$Revision: 1.11 $'[11:-2] __version__='$Revision: 1.12 $'[11:-2]
from DocumentTemplate import * from DocumentTemplate import *
import sys import sys
...@@ -360,7 +360,7 @@ def test5(): ...@@ -360,7 +360,7 @@ def test5():
Select an affiliate to visit:<br> Select an affiliate to visit:<br>
<UL> <UL>
<!--#in affiliates--> <!--#in affiliates-->
<LI><A HREF="<!--#var PARENT_URL-->/<!--#var ID-->/"> <LI><A HREF="<!--#var URL1-->/<!--#var ID-->/">
<!--#var name--></A></LI> <!--#var name--></A></LI>
<!--#/in affiliates--> <!--#/in affiliates-->
</UL> </UL>
...@@ -368,10 +368,10 @@ def test5(): ...@@ -368,10 +368,10 @@ def test5():
<!--#/if affiliates--> <!--#/if affiliates-->
<p> <p>
<A HREF="<!--#var PARENT_URL-->/add_affiliate_form">Add an affiliate</A> <A HREF="<!--#var URL1-->/add_affiliate_form">Add an affiliate</A>
<!--#if affiliates--> <!--#if affiliates-->
* <A HREF="<!--#var PARENT_URL-->/delete_affiliates_form"> * <A HREF="<!--#var URL1-->/delete_affiliates_form">
Delete affiliates</A> Delete affiliates</A>
<!--#/if affiliates--> <!--#/if affiliates-->
...@@ -381,7 +381,7 @@ def test5(): ...@@ -381,7 +381,7 @@ def test5():
</html>''') </html>''')
print html(affiliates=[], PARENT_URL='www') print html(affiliates=[], URL1='www')
def test6(): def test6():
def d(**kw): return kw def d(**kw): return kw
......
lib/python/Shared/DC/ZRDB/Aqueduct.py
View file @ f7ce9f48
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
__doc__='''Shared classes and functions __doc__='''Shared classes and functions
$Id: Aqueduct.py,v 1.31 1999/03/10 00:15:44 klm Exp $''' $Id: Aqueduct.py,v 1.32 1999/03/22 23:20:16 jim Exp $'''
__version__='$Revision: 1.31 $'[11:-2] __version__='$Revision: 1.32 $'[11:-2]
import Globals, os import Globals, os
from Globals import HTMLFile, Persistent from Globals import HTMLFile, Persistent
...@@ -178,9 +178,9 @@ class Searchable(BaseQuery): ...@@ -178,9 +178,9 @@ class Searchable(BaseQuery):
report=HTML(custom_default_report(self.id, result)) report=HTML(custom_default_report(self.id, result))
return apply(report,(self,REQUEST),{self.id:result}) return apply(report,(self,REQUEST),{self.id:result})
def index_html(self, PARENT_URL): def index_html(self, URL1):
" " " "
raise 'Redirect', ("%s/manage_testForm" % PARENT_URL) raise 'Redirect', ("%s/manage_testForm" % URL1)
class Composite: class Composite:
......
lib/python/Shared/DC/ZRDB/DA.py
View file @ f7ce9f48
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
__doc__='''Generic Database adapter __doc__='''Generic Database adapter
$Id: DA.py,v 1.63 1999/03/10 00:15:44 klm Exp $''' $Id: DA.py,v 1.64 1999/03/22 23:20:29 jim Exp $'''
__version__='$Revision: 1.63 $'[11:-2] __version__='$Revision: 1.64 $'[11:-2]
import OFS.SimpleItem, Aqueduct, RDB import OFS.SimpleItem, Aqueduct, RDB
import DocumentTemplate, marshal, md5, base64, DateTime, Acquisition, os import DocumentTemplate, marshal, md5, base64, DateTime, Acquisition, os
...@@ -309,9 +309,9 @@ class DA( ...@@ -309,9 +309,9 @@ class DA(
finally: tb=None finally: tb=None
def index_html(self, PARENT_URL): def index_html(self, URL1):
" " " "
raise 'Redirect', ("%s/manage_testForm" % PARENT_URL) raise 'Redirect', ("%s/manage_testForm" % URL1)
def _searchable_arguments(self): return self._arg def _searchable_arguments(self): return self._arg
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7