Changeset 796 for ZMS/trunk/ZMSMetaobjManager.py

Timestamp:

16.11.2009 16:10:24 (3 years ago)

Author:

cmeier

Message:

zms-2.12.1-04

File:

• ZMS/trunk/ZMSMetaobjManager.py (modified) (4 diffs)

ZMS/trunk/ZMSMetaobjManager.py

@@ -105 +105 @@
     # Globals.
     # --------
-    valid_types = ['amount','autocomplete','boolean','color','date','datetime','dialog','dictionary','file','float','identifier','image','int','list','multiautocomplete','multiselect','password','richtext','select','string','text','time','url','xml']
-    valid_xtypes = ['constant','delimiter','hint','interface','method','resource']
-    valid_datatypes = ['amount','autocomplete','boolean','color','constant','date','datetime','delimiter','dialog','dictionary','file','float','hint','identifier','image','int','interface','list','method','multiautocomplete','multiselect','password','resource','richtext','select','string','text','time','url','xml']
-    valid_objtypes = [ 'ZMSDocument', 'ZMSObject', 'ZMSTeaserElement', 'ZMSRecordSet', 'ZMSResource', 'ZMSReference', 'ZMSLibrary', 'ZMSPackage', 'ZMSModule']
+    valid_types =     ['amount','autocomplete','boolean','color','date','datetime','dialog','dictionary','file','float','identifier','image','int','list','multiautocomplete','multiselect','password','richtext','select','string','text','time','url','xml']
+    valid_xtypes =    ['constant','delimiter','hint','interface','method','resource']
+    valid_datatypes = valid_types+valid_xtypes
+    valid_datatypes.sort()
+    valid_objtypes =  [ 'ZMSDocument', 'ZMSObject', 'ZMSTeaserElement', 'ZMSRecordSet', 'ZMSResource', 'ZMSReference', 'ZMSLibrary', 'ZMSPackage', 'ZMSModule']
     valid_zopetypes = [ 'DTML Method', 'DTML Document', 'External Method', 'Page Template', 'Script (Python)', 'Z SQL Method']
 
@@ -299 +300 @@
             if action:
               l.append({'action':action,'filepath':filepath,'mrevision':mrevision,'filemrevision':filemrevision,'meta_type':self.meta_type})
-              if filepath in ids:
+              if filepath in ids or '*' in ids:
                 xml = self.exportMetaobjXml([id])
                 _fileutil.exportObj(xml,filepath)
@@ -317 +318 @@
         file = open(filepath)
         # Execute action.
-        if filepath in ids:
+        if filepath in ids or '*' in ids:
           ob.metaobj_manager.importMetaobjXml( file)
         elif filepath.endswith(suffix):
@@ -345 +346 @@
             filepath = path+'/'+filename
             # Execute action.
-            if filepath in ids:
+            if filepath in ids or '*' in ids:
               self.delMetaobj(id)
             elif not os.path.exists( filepath):