Changeset 1070

Timestamp:

25.06.2010 23:26:56 (20 months ago)

Author:

zmsdev

Message:

Applied fix for foreign-key references between content-objects.

Location:

ZMS/trunk

Files:

• _objattrs.py (modified) (2 diffs)
• dtml/ZMSRecordSet/actions.dtml (modified) (2 diffs)
• dtml/ZMSRecordSet/main.dtml (modified) (1 diff)
• dtml/ZMSRecordSet/main_grid.dtml (modified) (2 diffs)

ZMS/trunk/_objattrs.py

@@ -245 +245 @@
     def getObjAttr(self, key, meta_id=None):
       obj_attrs = self.getObjAttrs( meta_id)
-      return obj_attrs.get(key,{'id':key,'key':key,'xml':False,'multilang':False,'lang_inherit':False,'name':'UNKOWN','datatype':'string','datatype_key':_globals.DT_UNKNOWN})
+      return obj_attrs.get(key,{'id':key,'key':key,'xml':False,'multilang':False,'lang_inherit':False,'name':'UNKNOWN','datatype':'string','datatype_key':_globals.DT_UNKNOWN})
 
 
@@ -800 +800 @@
       
       #-- DATATYPE
-      datatype = obj_attr['datatype_key']
+      datatype = obj_attr.get('datatype_key',_globals.DT_UNKNOWN)
       
       #-- VALUE

ZMS/trunk/dtml/ZMSRecordSet/actions.dtml

@@ -115 +115 @@
   <dtml-in "metaObj['attrs'][1:]" mapping>
    <dtml-let obj_attr="getObjAttr(id)" obj_attrName="getObjAttrName(obj_attr,lang)">
-    <dtml-if "type in metaobj_manager.valid_types">
+    <dtml-if "type in metaobj_manager.valid_types or type not in metaobj_manager.valid_xtypes+metaobj_manager.valid_zopetypes">
      <dtml-call "REQUEST.set('value',formatObjAttrValue(obj_attr,REQUEST.get(obj_attrName),lang))">
      <dtml-try><dtml-call "operator_delattr(value,'aq_parent')"><dtml-except></dtml-try>
@@ -145 +145 @@
   <dtml-in "metaObj['attrs'][1:]" mapping>
    <dtml-let obj_attr="getObjAttr(id)" obj_attrName="getObjAttrName(obj_attr,lang)">
-    <dtml-if "type in metaobj_manager.valid_types">
+    <dtml-if "type in metaobj_manager.valid_types or type not in metaobj_manager.valid_xtypes+metaobj_manager.valid_zopetypes">
      <dtml-call "REQUEST.set('value',formatObjAttrValue(obj_attr,REQUEST.get(obj_attrName),lang))">
      <dtml-var "writeBlock('[actions.update]: %s=%s(%s)'%(str(id),str(value),str(REQUEST.get(obj_attrName))))">

ZMS/trunk/dtml/ZMSRecordSet/main.dtml

@@ -217 +217 @@
 </dtml-comment>
  <dtml-unless "REQUEST.get('action','') in ['insert','update']">
-  <dtml-var "metaobj_recordset_main_grid(_,_,grid_options=['insert','update','delete','export','statistics'])">
+  <dtml-var "metaobj_recordset_main_grid(_,_,grid_options=['insert','update','delete','export'])">
   <hr size="1"/>
   <input class="form-submit" name="btn" type="submit" value="<dtml-var "getZMILangStr('BTN_BACK')" html_quote>" onclick="location.href='<dtml-var "getParentNode().absolute_url()">/manage_main?lang=<dtml-var lang>#_<dtml-var id>';">  

ZMS/trunk/dtml/ZMSRecordSet/main_grid.dtml

@@ -18 +18 @@
 
  <dtml-in "metaObj['attrs']" mapping
-  ><dtml-let obj_attr="getObjAttr(id).copy()"
+  ><dtml-let si=sequence-item obj_attr="getObjAttr(id).copy()"
    ><dtml-if custom
     ><dtml-unless sequence-start
-     ><dtml-unless "type in metaobj_manager.valid_xtypes+metaobj_manager.valid_zopetypes or id==SESSION.get('fk_key_%s'%ZMS_THIS.id,'')"
-      ><dtml-call "operator_setitem(obj_attr,'type',type)"
+     ><dtml-if "type in metaobj_manager.valid_types or id==SESSION.get('fk_key_%s'%ZMS_THIS.id,'')"
       ><dtml-call "obj_attrs.append(obj_attr)"
-     ></dtml-unless
+     ><dtml-elif "type not in metaobj_manager.valid_xtypes+metaobj_manager.valid_zopetypes"
+      ><dtml-call "obj_attrs.append(si)"
+     ></dtml-if
     ></dtml-unless
    ></dtml-if
@@ -287 +288 @@
  <dtml-call "REQUEST.set('qpage',qpage+1)">
 
-<dtml-if "'statistics' in grid_options">
-<dtml-if vs>
- <tr>
-  <td colspan="3"><img src="<dtml-var spacer_gif>" alt="" border="0"></td>
- <dtml-in obj_attrs mapping>
-  <dtml-let obj_attr=sequence-item l="vs.get(id,[])">
-   <td class="form-small">
-    <dtml-try>
-     <dtml-if l>
-      <dtml-let meanstdv="zmsmathutil.meanstdv(l)">
-       <span style="font-family: serif; font-style: italic; text-decoration: overline;" title="AVG">x</span>=<dtml-var "meanstdv[0]">&plusmn;<dtml-var "meanstdv[1]">
-      </dtml-let>
-     </dtml-if>
-    <dtml-except></dtml-try>
-   </td>
-  </dtml-let>
- </dtml-in>
- </tr>
-</dtml-if>
-</dtml-if>
-
  </table>