Changeset 274

Timestamp:

06.11.2008 13:06:48 (3 years ago)

Author:

chris

Message:

zms-2.11.1-140

Location:

ZMS/trunk

Files:

• _objchildren.py (modified) (1 diff)
• changes.txt (modified) (1 diff)
• dtml/ZMSObject/input_fields.dtml (modified) (2 diffs)
• dtml/ZMSObject/input_js.dtml (modified) (1 diff)
• import/manage_searchReplace.metacmd.xml (modified) (4 diffs)
• version.txt (modified) (1 diff)

ZMS/trunk/_objchildren.py

@@ -226 +226 @@
       #-- Headline.
       if len(actions) > 0:
-        actions.insert(0,('----- %s -----'%self.getZMILangStr('ACTION_SELECT')%self.getZMILangStr('ATTR_ACTION'),'',actions))
+        actions.insert(0,('----- %s -----'%self.getZMILangStr('ACTION_SELECT')%self.getZMILangStr('ATTR_ACTION'),''))
       
       #-- Insert.

ZMS/trunk/changes.txt

@@ -1028 +1028 @@
 [01115] Revised special-object 'TeX' (requested by desy).
 --------------------------------------------------
+2008-11-06:zms-2.11.1-14
+[01116] Revised action 'Search&Replace' (contributed by fh).
+--------------------------------------------------

ZMS/trunk/dtml/ZMSObject/input_fields.dtml

@@ -49 +49 @@
           
         <dtml-else>
-         <select class="form-small" onchange="submitSelect(this)">
+         <select class="form-small" onchange="submitSelectResource(this)">
           <dtml-if "objAttr.get('repetitive',0)==1">
            <option value=""><dtml-var "'----- %s -----'%getZMILangStr('ACTION_INSERT')%display_type(REQUEST,metaObj['id'])"></option>
@@ -71 +71 @@
     <td><div class="form-label<dtml-if disabled>-disabled</dtml-if>"><dtml-var elLabel><dtml-if required><sup style="color:red">*</sup></dtml-if></div></td>
     <td>
-     <select class="form-small" onchange="submitSelect(this)">
+     <select class="form-small" onchange="submitSelectResource(this)">
       <option value=""><dtml-var "'----- %s -----'%getZMILangStr('ACTION_INSERT')%display_type(REQUEST,metaObj['id'])"></option>
       <option value="manage_initObjChild?id=<dtml-var "objAttr['id']">&type=<dtml-var "objAttr['type']">&lang=<dtml-var lang>&target=<dtml-var URL>"><dtml-var "display_type(REQUEST,objAttr['type'])"></option>

ZMS/trunk/dtml/ZMSObject/input_js.dtml

@@ -59 +59 @@
   }
 
-  function submitSelect(el)
+  function submitSelectResource(el)
   {
     var v = $(el).val();

ZMS/trunk/import/manage_searchReplace.metacmd.xml

@@ -22 +22 @@
     <dtml-call "REQUEST.set('subcount',0)">
     <dtml-if "_.len(REQUEST.get('s_old','')) > 0">
-     <dtml-in "_.string.split(s_src,REQUEST.get('s_old',''))">
+     <dtml-in "_.string.split(_.str(s_src),REQUEST.get('s_old',''))">
       <dtml-call "REQUEST.set('s_dst',s_dst+_['sequence-item'])">
       <dtml-unless sequence-end>
@@ -60 +60 @@
  <dtml-var manage_page_header>
  </head>
- <dtml-var "manage_tabs(_,_,my_manage_options=[{'label':'Suchen & Ersetzen...','action':''}])">
+ <dtml-var "manage_tabs(_,_,my_manage_options=[{'label':'Replace...','action':''}])">
  <dtml-var f_bo_area>
 
@@ -89 +89 @@
  <dtml-var manage_page_header>
  </head>
- <dtml-var "manage_tabs(_,_,my_manage_options=[{'label':'Suchen & Ersetzen...','action':''}])">
+ <dtml-var "manage_tabs(_,_,my_manage_options=[{'label':'Replace...','action':''}])">
  <dtml-var f_bo_area>
 
@@ -138 +138 @@
 </item>
 </dictionary>
+

ZMS/trunk/version.txt

@@ -1 @@
-ZMS 2.11.1-13
+ZMS 2.11.1-14