Changeset 1122

Timestamp:

21.07.2010 22:19:32 (19 months ago)

Author:

zmsdev

Message:

Added support for defaults of mandatory sub-objects, insert-commands and programmatic zexp import.

Location:

ZMS/trunk

Files:

• ZMSGlobals.py (modified) (1 diff)
• ZMSMetaobjManager.py (modified) (2 diffs)
• _fileutil.py (modified) (1 diff)
• _objchildren.py (modified) (2 diffs)
• dtml/ZMSMetamodelProvider/manage_main.dtml (modified) (1 diff)
• zmscontainerobject.py (modified) (2 diffs)
• zmsobject.py (modified) (2 diffs)

ZMS/trunk/ZMSGlobals.py

@@ -158 +158 @@
       f.aq_parent = self
       return f
+
+    # --------------------------------------------------------------------------
+    #  ZMSGlobals.import_zexp:
+    # --------------------------------------------------------------------------
+    def import_zexp(self, zexp, new_id, id_prefix, _sort_id=0):
+      """
+      Import zexp.
+      @param zexp
+      @type L{MyFile}
+      """
+      return _fileutil.import_zexp(self, zexp, new_id, id_prefix, _sort_id)
 
     # --------------------------------------------------------------------------

ZMS/trunk/ZMSMetaobjManager.py

@@ -47 +47 @@
 def syncType( self, meta_id, attr):
   try:
-    if attr['type'] == 'resource':
+    if (attr['type'] in ['resource']) or \
+       (attr.get('mandatory',0)==1 and attr['type'] in self.getMetaobjIds()):
       ob = getattr( self, meta_id+'.'+attr['id'], None)
       if ob is not None:
@@ -751 +752 @@
       
       # Handle resources.
-      if newType == 'resource':
+      if (newType in ['resource']) or \
+         (newMandatory and newType in self.getMetaobjIds()):
         if isinstance( newCustom, _blobfields.MyFile):
           if oldId is not None and id+'.'+oldId in self.objectIds():

ZMS/trunk/_fileutil.py

@@ -34 +34 @@
 import tempfile
 import zipfile
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+_fileutil.import_zexp:
+
+Import zexp.
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+def import_zexp(self, zexp, new_id, id_prefix, _sort_id=0):
+  # Import
+  filename = zexp.title_or_id()
+  fileid = filename[:filename.find('.')]
+  filepath = INSTANCE_HOME + '/import/' + filename
+  exportObj( zexp, filepath)
+  importZexp( self, filename)
+  
+  # Rename
+  self.manage_renameObject(fileid,new_id)
+  
+  ## Normalize Sort-IDs
+  obj = getattr( self, new_id)
+  obj.sort_id = _sort_id
+  self.normalizeSortIds( id_prefix)
 
 

ZMS/trunk/_objchildren.py

@@ -29 +29 @@
 # Product Imports.
 import _blobfields
+import _fileutil
 import _globals
 
@@ -105 +106 @@
       if mandatory:
         if len(ids) == 0:
-          if obj_attr['type'] == '*' and type( obj_attr['keys']) is list and len( obj_attr['keys']) > 0:
-            obj_attr['type'] = obj_attr['keys'][0]
-          self.initObjChild(obj_attr['id'],0,obj_attr['type'],REQUEST)
+          default  = obj_attr.get('custom')
+          if default:
+            _fileutil.import_zexp(self,default,obj_attr['id'],obj_attr['id'])
+          else:
+            if obj_attr['type'] == '*' and type( obj_attr['keys']) is list and len( obj_attr['keys']) > 0:
+              obj_attr['type'] = obj_attr['keys'][0]
+            self.initObjChild(obj_attr['id'],0,obj_attr['type'],REQUEST)
       repetitive = obj_attr.get('repetitive',0)==1
       if repetitive:

ZMS/trunk/dtml/ZMSMetamodelProvider/manage_main.dtml

@@ -786 +786 @@
              ></dtml-in
             ></select
-           ></dtml-if
+           ><dtml-elif "oAttr['type'] in meta_types"
+            ><img src="<dtml-var MISC_ZMS>ico_default.gif" title="default" style="margin:0px 6px 0px 6px;" style="vertical-align:middle"/>
+            <input type="hidden" name="attr_custom_<dtml-var "oAttr['id']">_modified" value="0"/>
+            <input class="form-small" type="file" name="attr_custom_<dtml-var "oAttr['id']">" size="15" onchange="changeCustom(this);"/>
+            <dtml-if "oAttr.get('custom',None)">
+             <dtml-try>
+             <dtml-let f="oAttr['custom']">
+              <a href="<dtml-var "f.absolute_url()">" target="_blank" class="zmi"><dtml-var "string_maxlen(f.title,20)"></a> 
+              <strong>(<dtml-var "getDataSizeStr(f.get_size())">)</strong>
+             </dtml-let>
+             <dtml-except><dtml-var error_type>: <dtml-var error_value><hr/><dtml-var error_tb newline_to_br></dtml-try>
+            </dtml-if>
+           </dtml-if
            ></nobr
           ></td>

ZMS/trunk/zmscontainerobject.py

@@ -620 +620 @@
               actions.append( action)
       
+      #-- Insert Commands.
+      actions.extend(self.filtered_command_actions(path,REQUEST,insert_actions=True))
+      
       #-- Sort.
       actions.sort()
       
-      #-- Headline,
+      #-- Headline.
       if len(actions) > 0:
         actions.insert(0,('----- %s -----'%self.getZMILangStr('ACTION_INSERT')%self.display_type(REQUEST),''))
@@ -1001 +1004 @@
       attr = self.getMetaobjAttr( meta_id, key)
       zexp = attr[ 'custom']
-      filename = zexp.title_or_id()
-      fileid = filename[:filename.find('.')]
-      filepath = INSTANCE_HOME + '/import/' + filename
-      _fileutil.exportObj( zexp, filepath)
-      _fileutil.importZexp( self, filename)
-      
-      ##### Create ####
       id_prefix = _globals.id_prefix(REQUEST.get('id_prefix','e'))
       new_id = self.getNewId(id_prefix)
-      
-      ##### Rename ####
-      self.manage_renameObject(fileid,new_id)
-      
-      ##### Normalize Sort-IDs ####
-      obj = getattr( self, new_id)
-      obj.sort_id = _sort_id
-      self.normalizeSortIds( id_prefix)
+      _fileutil.import_zexp(self,zexp,new_id,id_prefix,_sort_id)
       
       # Return with message.

ZMS/trunk/zmsobject.py

@@ -957 +957 @@
     #  ZMSObject.filtered_command_actions:
     # --------------------------------------------------------------------------
-    def filtered_command_actions(self, path, REQUEST):
+    def filtered_command_actions(self, path, REQUEST, insert_actions=False):
       actions = []
       auth_user = REQUEST['AUTHENTICATED_USER']
@@ -964 +964 @@
       for metaCmdId in self.getMetaCmdIds():
         metaCmd = self.getMetaCmd(metaCmdId)
-        hasMetaType = self.meta_id in metaCmd['meta_types']
-        hasRole = False
-        hasRole = hasRole or len(self.intersection_list(self.getUserRoles(auth_user),metaCmd['roles'])) > 0
-        hasRole = hasRole or auth_user.has_role('Manager')
-        if hasMetaType and hasRole:
-          actions.append((metaCmd['name'],path+'manage_executeMetacmd'))
+        if (insert_actions and metaCmd['id'].startswith('manage_add')) or \
+           (not insert_actions and not metaCmd['id'].startswith('manage_add')):
+          hasMetaType = self.meta_id in metaCmd['meta_types']
+          hasRole = False
+          hasRole = hasRole or len(self.intersection_list(self.getUserRoles(auth_user),metaCmd['roles'])) > 0
+          hasRole = hasRole or auth_user.has_role('Manager')
+          if hasMetaType and hasRole:
+            actions.append((metaCmd['name'],path+'manage_executeMetacmd'))
       
       # Return action list.