Changeset 1125

Timestamp:

26.07.2010 22:22:20 (19 months ago)

Author:

zmsdev

Message:

Applied fix for error in ZMSTable when no wysiwyg-format is defined: getId() (reported by uni-cgn).

File:

• ZMS/trunk/import/zms.metaobj.xml (modified) (3 diffs)

ZMS/trunk/import/zms.metaobj.xml

@@ -3147 +3147 @@
        <tr>
        <<dtml-var tag> title="onDblClick: <dtml-var "getZMILangStr('ACTION_EDIT_CELL')">" class="contentEditable">
-        <div id="input_<dtml-var col_index>_<dtml-var row_index>" <dtml-if "format==REQUEST.get('richedit_fmt').getId()">style="display:none;"</dtml-if>>
+        <div id="input_<dtml-var col_index>_<dtml-var row_index>" <dtml-if "REQUEST.get('richedit_fmt') is not None and format==REQUEST.get('richedit_fmt').getId()">style="display:none;"</dtml-if>>
          <input type="hidden" id="tag_<dtml-var col_index>_<dtml-var row_index>" value="<dtml-var tag>">
          <input type="hidden" id="format_<dtml-var col_index>_<dtml-var row_index>" value="<dtml-var format>">
          <dtml-var "getTextArea(fmName,'content_%i_%i'%(col_index,row_index),10,1,value=content,enabled=True,REQUEST=REQUEST,css='form-element',extra=' style='+QUOT+'border:none;background-color:transparent;width:100%;'+QUOT)">
         </div>
-        <div id="preview_<dtml-var col_index>_<dtml-var row_index>" <dtml-if "format!=REQUEST.get('richedit_fmt').getId()">style="display:none;"</dtml-if>>
+        <div id="preview_<dtml-var col_index>_<dtml-var row_index>" <dtml-if "REQUEST.get('richedit_fmt') is None or format!=REQUEST.get('richedit_fmt').getId()">style="display:none;"</dtml-if>>
          <dtml-var content>
         </div>
@@ -3240 +3240 @@
                     <item key="repetitive" type="int">0</item>
                     <item key="type"><![CDATA[list]]></item>
-                  </dictionary>
-                </item>
-                <item type="dictionary">
-                  <dictionary>
-                    <item key="id"><![CDATA[isActive]]></item>
-                    <item key="mandatory" type="int">0</item>
-                    <item key="multilang" type="int">0</item>
-                    <item key="name"><![CDATA[isActive]]></item>
-                    <item key="repetitive" type="int">0</item>
-                    <item key="type"><![CDATA[isActive]]></item>
-                  </dictionary>
-                </item>
-                <item type="dictionary">
-                  <dictionary>
-                    <item key="id"><![CDATA[attr_targetgroups]]></item>
-                    <item key="mandatory" type="int">0</item>
-                    <item key="multilang" type="int">0</item>
-                    <item key="name"><![CDATA[Zielgruppe(n)]]></item>
-                    <item key="repetitive" type="int">0</item>
-                    <item key="type"><![CDATA[attr_targetgroups]]></item>
-                  </dictionary>
-                </item>
-                <item type="dictionary">
-                  <dictionary>
-                    <item key="id"><![CDATA[manage_main_change]]></item>
-                    <item key="mandatory" type="int">0</item>
-                    <item key="multilang" type="int">0</item>
-                    <item key="name"><![CDATA[manage_main_change]]></item>
-                    <item key="repetitive" type="int">0</item>
-                    <item key="type"><![CDATA[manage_main_change]]></item>
                   </dictionary>
                 </item>
@@ -3424 +3394 @@
             <item key="name"><![CDATA[ZMSTable]]></item>
             <item key="package"><![CDATA[com.zms.foundation]]></item>
-            <item key="revision"><![CDATA[1.4.2]]></item>
+            <item key="revision"><![CDATA[1.4.3]]></item>
             <item key="type"><![CDATA[ZMSObject]]></item>
           </dictionary>