Skip to content

Z
Zope
Commit 5de6d548 authored by Paul Everitt's avatar Paul Everitt
Browse files
Options

Added a precondition to File objects

parent e1717745
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 9 deletions
lib/python/OFS/Image.py
View file @ 5de6d548
"""Image object""" """Image object"""
__version__='$Revision: 1.35 $'[11:-2] __version__='$Revision: 1.36 $'[11:-2]
import Globals import Globals
from Globals import HTMLFile, MessageDialog from Globals import HTMLFile, MessageDialog
...@@ -11,11 +11,12 @@ from Acquisition import Implicit ...@@ -11,11 +11,12 @@ from Acquisition import Implicit
from DateTime import DateTime from DateTime import DateTime
manage_addFileForm=HTMLFile('imageAdd', globals(),Kind='File',kind='file') manage_addFileForm=HTMLFile('imageAdd', globals(),Kind='File',kind='file')
def manage_addFile(self,id,file,title='',REQUEST=None): def manage_addFile(self,id,file,title='',precondition='',REQUEST=None):
"""Add a new File object. """Add a new File object.
Creates a new file object 'id' with the contents of 'file'""" Creates a new file object 'id' with the contents of 'file'"""
self._setObject(id, File(id,title,file))
self._setObject(id, File(id,title,file,precondition))
return self.manage_main(self,REQUEST) return self.manage_main(self,REQUEST)
...@@ -27,8 +28,9 @@ class File(Persistent,Implicit,RoleManager,Item_w__name__): ...@@ -27,8 +28,9 @@ class File(Persistent,Implicit,RoleManager,Item_w__name__):
meta_type='File' meta_type='File'
icon='p_/file' icon='p_/file'
precondition=''
manage_editForm =HTMLFile('imageEdit',globals(),Kind='File',kind='file') manage_editForm =HTMLFile('fileEdit',globals(),Kind='File',kind='file')
manage_uploadForm=HTMLFile('imageUpload',globals(),Kind='File',kind='file') manage_uploadForm=HTMLFile('imageUpload',globals(),Kind='File',kind='file')
manage=manage_main=manage_editForm manage=manage_main=manage_editForm
...@@ -47,7 +49,8 @@ class File(Persistent,Implicit,RoleManager,Item_w__name__): ...@@ -47,7 +49,8 @@ class File(Persistent,Implicit,RoleManager,Item_w__name__):
) )
def __init__(self,id,title,file,content_type='application/octet-stream'): def __init__(self,id,title,file,
precondition='',content_type='application/octet-stream'):
try: headers=file.headers try: headers=file.headers
except: headers=None except: headers=None
if headers is None: if headers is None:
...@@ -65,33 +68,46 @@ class File(Persistent,Implicit,RoleManager,Item_w__name__): ...@@ -65,33 +68,46 @@ class File(Persistent,Implicit,RoleManager,Item_w__name__):
self.data=Pdata(file.read()) self.data=Pdata(file.read())
self.__name__=id self.__name__=id
self.title=title self.title=title
if precondition: self.precondition=precondition
self.size=len(self.data) self.size=len(self.data)
def id(self): return self.__name__ def id(self): return self.__name__
def index_html(self, RESPONSE): def index_html(self, REQUEST,RESPONSE):
""" """
The default view of the contents of the File or Image. The default view of the contents of the File or Image.
Returns the contents of the file or image. Also, sets the Returns the contents of the file or image. Also, sets the
'content-type' HTTP header to the objects content type. 'content-type' HTTP header to the objects content type.
""" """
if self.precondition and hasattr(self,self.precondition):
# Grab whatever precondition was defined and then
# execute it. The precondition will raise an exception
# if something violates its terms.
c=getattr(self,self.precondition)
if hasattr(c,'isDocTemp') and c.isDocTemp:
c(REQUEST['PARENTS'][1],REQUEST)
else:
c()
RESPONSE['content-type'] =self.content_type RESPONSE['content-type'] =self.content_type
return self.data return self.data
def view_image_or_file(self, RESPONSE): def view_image_or_file(self,REQUEST,RESPONSE):
""" """
The default view of the contents of the File or Image. The default view of the contents of the File or Image.
""" """
return self.index_html(RESPONSE) return self.index_html(REQUEST,RESPONSE)
def manage_edit(self,title,content_type,REQUEST=None): def manage_edit(self,title,content_type,precondition='',REQUEST=None):
""" """
Changes the title and content type attributes of the File or Image. Changes the title and content type attributes of the File or Image.
""" """
self.title=title self.title=title
self.content_type=content_type self.content_type=content_type
if precondition: self.precondition=precondition
elif self.precondition: del self.precondition
if REQUEST: return MessageDialog( if REQUEST: return MessageDialog(
title ='Success!', title ='Success!',
message='Your changes have been saved', message='Your changes have been saved',
......
lib/python/OFS/fileEdit.dtml 0 → 100644
View file @ 5de6d548
<HTML>
<HEAD>
<TITLE>Edit</TITLE>
</HEAD>
<BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
<!--#var manage_tabs-->
<FORM ACTION="manage_edit" METHOD="POST" TARGET="manage_main">
<TABLE CELLSPACING="2">
<TR>
<TH ALIGN="LEFT" VALIGN="TOP">Id</STRONG></TH>
<TD ALIGN="LEFT" VALIGN="TOP"><!--#var id--></TD>
</TR>
<TR>
<TH ALIGN="LEFT" VALIGN="TOP"><EM>Title</EM></TH>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="title" SIZE="40" VALUE="<!--#var title-->">
</TD>
</TR>
<TR>
<TH ALIGN="LEFT" VALIGN="TOP">Content Type</TH>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="content_type:required" SIZE="40"
VALUE="<!--#var content_type-->">
</TD>
</TR>
<TR>
<TH ALIGN="LEFT" VALIGN="TOP"><em>Precondition</em></TH>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="precondition" SIZE="40"
VALUE="<!--#var precondition-->">
</TD>
</TR>
<TR>
<TH ALIGN="LEFT" VALIGN="TOP">Size</TH>
<TD ALIGN="LEFT" VALIGN="TOP"><!--#var size thousands_commas--> bytes</TD>
</TR>
<TR>
<TH ALIGN="LEFT" VALIGN="TOP">Last modified</TH>
<TD ALIGN="LEFT" VALIGN="TOP"><!--#var bobobase_modification_time--></TD>
</TR>
<TR>
<TD></TD><TD><BR><INPUT TYPE="SUBMIT" VALUE="Change"></TD>
</TR>
</TABLE>
</FORM>
</BODY>
</HTML>
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