Changeset 1734 for ZMS/trunk

Timestamp:

18.11.2011 14:31:33 (6 months ago)

Author:

fhoffmann

Message:

applied fix for avoiding warnings during Zope start

Location:

ZMS/trunk

Files:

• ZMSFormatProvider.py (modified) (1 diff)
• ZMSGlobals.py (modified) (6 diffs)
• ZMSMetamodelProvider.py (modified) (1 diff)
• ZMSMetaobjManager.py (modified) (2 diffs)
• ZMSWorkflowProvider.py (modified) (1 diff)
• ZMSWorkflowProviderAcquired.py (modified) (1 diff)
• _confmanager.py (modified) (2 diffs)
• import/zms.metaobj.xml (modified) (2 diffs)
• zmscustom.py (modified) (1 diff)
• zmssqldb.py (modified) (1 diff)

ZMS/trunk/ZMSFormatProvider.py

@@ -62 +62 @@
     # Management Interface.
     # ---------------------
-    manage = manage_main = manage_textformats = HTMLFile('dtml/ZMSFormatProvider/manage_textformats', globals())
+    manage = HTMLFile('dtml/ZMSFormatProvider/manage_textformats', globals())
+    manage_main = HTMLFile('dtml/ZMSFormatProvider/manage_textformats', globals()) # -"-
+    manage_textformats = HTMLFile('dtml/ZMSFormatProvider/manage_textformats', globals()) # -"-
     manage_charformats = HTMLFile('dtml/ZMSFormatProvider/manage_charformats', globals())
 

ZMS/trunk/ZMSGlobals.py

@@ -36 +36 @@
 import time
 import urllib
+import zExceptions
 import zope.interface
 # Product Imports.
@@ -1273 +1274 @@
           authorized = authorized or ( len( perm) > 0 and filename.lower().startswith( _fileutil.absoluteOSPath(perm).lower()))
       if not authorized:
-          RESPONSE = REQUEST.RESPONSE
-          raise RESPONSE.unauthorized()
+          raise zExceptions.Unauthorized
       
       # Read file.
@@ -1313 +1313 @@
           authorized = authorized or ( len( perm) > 0 and filename.lower().startswith( _fileutil.absoluteOSPath(perm).lower()))
       if not authorized:
-          RESPONSE = request.RESPONSE
-          raise RESPONSE.unauthorized()
+          raise zExceptions.Unauthorized
       
       # Write file.
@@ -1342 +1341 @@
         authorized = authorized or ( len( perm) > 0 and filename.lower().startswith( _fileutil.absoluteOSPath(perm.lower())))
       if not authorized:
-        RESPONSE = request.RESPONSE
-        raise RESPONSE.unauthorized()
+        raise zExceptions.Unauthorized
       
       # Remove file.
@@ -1380 +1378 @@
         authorized = authorized or ( len( perm) > 0 and filename.lower().startswith( _fileutil.absoluteOSPath(perm).lower()))
       if not authorized:
-        RESPONSE = request.RESPONSE
-        raise RESPONSE.unauthorized()
+        raise zExceptions.Unauthorized
       
       # Read path.
@@ -1485 +1482 @@
       authorized = path.find('..') < 0
       if not authorized:
-        RESPONSE = REQUEST.RESPONSE
-        raise RESPONSE.unauthorized()
+        raise zExceptions.Unauthorized
       
       try:

ZMS/trunk/ZMSMetamodelProvider.py

@@ -62 +62 @@
     # Management Interface.
     # ---------------------
-    manage = manage_main = HTMLFile('dtml/ZMSMetamodelProvider/manage_main', globals())
+    manage = HTMLFile('dtml/ZMSMetamodelProvider/manage_main', globals())
+    manage_main = HTMLFile('dtml/ZMSMetamodelProvider/manage_main', globals()) # -"-
     manage_bigpicture = HTMLFile('dtml/ZMSMetamodelProvider/manage_bigpicture', globals())
     manage_analyze = HTMLFile('dtml/ZMSMetamodelProvider/manage_analyze', globals())

ZMS/trunk/ZMSMetaobjManager.py

@@ -772 +772 @@
       
       # Handle resources.
-      if (newType in ['resource','Folder']) or \
+      if (newType in ['resource']) or \
          (newMandatory and newType in self.getMetaobjIds()) or \
          (newRepetitive and newType in self.getMetaobjIds()):
-        if newType == 'Folder':
-          if oldId is not None: oldId = _globals.id_quote(oldId)
-          if newId is not None: newId = _globals.id_quote(newId)
         if not newCustom:
           if oldId is not None and id+'.'+oldId in self.objectIds():
@@ -933 +930 @@
             newOb.manage_acquiredPermissions([])
         elif newType == 'Folder':
-          f = getattr( self, id+'.'+_globals.id_quote(newId), None)
-          if f is not None:
-            _ziputil.importZip2Zodb( newOb, f.data)
+          if isinstance( newCustom, _blobfields.MyFile) and len(newCustom.filename) > 0:
+            newOb.manage_delObjects(ids=newOb.objectIds())
+            _ziputil.importZip2Zodb( newOb, newCustom.getData())
+          attr['custom'] = ''
         elif newType == 'Script (Python)':
           newOb.write(newCustom)

ZMS/trunk/ZMSWorkflowProvider.py

@@ -135 +135 @@
     Management Interface
     """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-    manage = manage_main = HTMLFile('dtml/ZMSWorkflowProvider/manage_main', globals())
+    manage = HTMLFile('dtml/ZMSWorkflowProvider/manage_main', globals())
+    manage_main = HTMLFile('dtml/ZMSWorkflowProvider/manage_main', globals()) # -"-
 
     """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

ZMS/trunk/ZMSWorkflowProviderAcquired.py

@@ -56 +56 @@
     Management Interface
     """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-    manage = manage_main = HTMLFile('dtml/ZMSWorkflowProvider/manage_main_acquired', globals())
+    manage = HTMLFile('dtml/ZMSWorkflowProvider/manage_main_acquired', globals())
+    manage_main = HTMLFile('dtml/ZMSWorkflowProvider/manage_main_acquired', globals()) # -"-
 
 

ZMS/trunk/_confmanager.py

@@ -32 +32 @@
 import stat
 import urllib
+import zExceptions
 import zope.interface
 # Product imports.
@@ -595 +596 @@
       """ ConfManager.getConfProperty """
       if REQUEST is not None:
-        authorized = REQUEST['AUTHENTICATED_USER'].has_role('Authenticated')
-        if not authorized:
-          RESPONSE = REQUEST.RESPONSE
-          raise RESPONSE.unauthorized()
+          authorized = REQUEST['AUTHENTICATED_USER'].has_role('Authenticated')
+          if not authorized:
+              raise zExceptions.Unauthorized
       if OFS.misc_.misc_.zms['confdict'].has_key(key):
-        default = OFS.misc_.misc_.zms['confdict'].get(key)
+          default = OFS.misc_.misc_.zms['confdict'].get(key)
       return self.getConfProperties().get( key, default)
 

ZMS/trunk/import/zms.metaobj.xml

@@ -1913 +1913 @@
     <span tal:omit-tag="" tal:define="global subclass python:subclass+['floatright']"></span>
   </span>
-  <div tal:condition="python:align not in ['','NONE'] or request.get('URL','').find('/manage')>0"
+  <div tal:condition="python:zmscontext.getParentNode().meta_id=='ZMSLinkContainer' or align not in ['','NONE'] or request.get('URL','').find('/manage')>0"
        tal:attributes="id python:zmscontext.id; class python:' '.join(subclass)">
     <div class="title" tal:condition="python:title.lower()!='medline' and title">
@@ -1973 +1973 @@
           <item key="name"><![CDATA[ZMSLinkElement]]></item>
           <item key="package"><![CDATA[com.zms.foundation]]></item>
-          <item key="revision"><![CDATA[1.2.2]]></item>
+          <item key="revision"><![CDATA[1.2.3]]></item>
           <item key="type"><![CDATA[ZMSObject]]></item>
         </dictionary>

ZMS/trunk/zmscustom.py

@@ -166 +166 @@
     # ----------
     manage_container = HTMLFile('dtml/ZMSContainerObject/manage_main', globals())
-    manage_main = manage_properties = HTMLFile('dtml/ZMSObject/manage_main', globals())
+    manage_main = HTMLFile('dtml/ZMSObject/manage_main', globals())
+    manage_properties = HTMLFile('dtml/ZMSObject/manage_main', globals()) # -"-
     manage_main_iframe = HTMLFile('dtml/ZMSObject/manage_main_iframe', globals())
     metaobj_record_select = HTMLFile('dtml/ZMSRecordSet/record_select', globals())

ZMS/trunk/zmssqldb.py

@@ -107 +107 @@
         'manage_moveObjUp','manage_moveObjDown','manage_moveObjToPos',
         'manage_cutObjects','manage_copyObjects','manage_pasteObjs',
-        'manage_ajaxZMIActions',
         'manage_userForm', 'manage_user',
         'manage_importexport', 'manage_import', 'manage_export',