Changeset 276


Ignore:
Timestamp:
10.11.2008 18:07:36 (3 years ago)
Author:
chris
Message:

zms-2.11.1-142

Location:
ZMS/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • ZMS/trunk/ZMSMetaobjManager.py

    r252 r276  
    310310      ob = ob.copy() 
    311311      ob[ 'name'] = ob.get( 'name', '') 
     312      ob[ 'revision'] = ob.get( 'revision', '0.0.0') 
    312313      ob[ 'type'] = ob.get( 'type', '') 
    313314      ob[ 'package'] = ob.get( 'package', '') 
    … …  
    805806            newValue['id'] = id 
    806807            newValue['name'] = REQUEST.get('obj_name').strip() 
     808            newValue['revision'] = REQUEST.get('obj_revision').strip() 
    807809            newValue['type'] = REQUEST.get('obj_type').strip() 
    808810            newValue['package'] = REQUEST.get('obj_package').strip() 
    … …  
    890892                  attrs.append( attr) 
    891893                ob['__obj_attrs__'] = attrs 
    892                 del ob['attrs'] 
    893                 if ob.has_key('zms_system'): 
    894                   del ob['zms_system'] 
     894                for key in ['attrs','zms_system','acquired']: 
     895                  if ob.has_key(key): 
     896                    del ob[key] 
    895897                # Value. 
    896898                value.append({'key':id,'value':ob}) 

  • ZMS/trunk/changes.txt

    r274 r276  
    103010302008-11-06:zms-2.11.1-14 
    10311031[01116] Revised action 'Search&Replace' (contributed by fh). 
    1032 -------------------------------------------------- 
     1032[01117] Applied fix for support of simultaneous remote- (via ftp) and web-editing (via zmi) of content-object-methods (requested by desy). 
     1033-------------------------------------------------- 

  • ZMS/trunk/dtml/ZMS/manage_editorform.dtml

    r267 r276  
    2121       var fm = parent.cameFromForm.document.forms['<dtml-var fmName>']; 
    2222       fm.elements['<dtml-var elName>'].value = document.forms['form0'].elements['editor'].value; 
     23       fireEvent( fm.elements['<dtml-var elName>'], 'change'); 
    2324       for (var i = 0; i < fm.elements.length; i++) { 
    2425         var el = fm.elements[i]; 

  • ZMS/trunk/dtml/ZMSContainerObject/main_js.dtml

    r121 r276  
    268268  } 
    269269 
    270   /** 
    271    * 
    272    */ 
    273   function switchButtons(uncheckedClassName)  
    274   { 
    275     for (var i = 0; i < arrButton.length; i++) { 
    276        btnOnMouseOut(arrButton[i]); 
    277     } 
    278     var fm = document.forms['form0']; 
    279     var els = fm.elements; 
    280     for ( var i = 0; i < els.length; i++) { 
    281       var el = els[ i]; 
    282       if ( el.type == 'checkbox' && el.name == 'ids:list') { 
    283         var tr = document.getElementById( 'tr_'+el.value); 
    284         if ( el.checked)  
    285           tr.className = "zmiTeaserColor"; 
    286         else if (uncheckedClassName) 
    287           tr.className = uncheckedClassName; 
    288         else 
    289           tr.className = ""; 
    290       } 
    291     } 
    292   } 
     270/** 
     271 * 
     272 */ 
     273function switchButtons()  
     274{ 
     275  for (var i = 0; i < arrButton.length; i++) { 
     276     btnOnMouseOut(arrButton[i]); 
     277  } 
     278  // Toggle highlighting of selected rows. 
     279  var clazz = "zmiTeaserColor"; 
     280  var els = $("input[@name=ids:list][@type=checkbox]"); 
     281  for (var i = 0; i < els.length; i++) { 
     282    var tr = $($(els[i]).parents("tr")[0]); 
     283    if (els[i].checked) { 
     284      tr.addClass( clazz); 
     285    } 
     286    else { 
     287      tr.removeClass( clazz); 
     288    } 
     289  } 
     290} 
    293291 
    294292  /** 

  • ZMS/trunk/dtml/ZMSContainerObject/manage_main_change.dtml

    r121 r276  
    3737<dtml-comment>#####  Custom  ####################################</dtml-comment> 
    3838<dtml-var "getObjProperty('manage_main_change',REQUEST)"> 
     39<dtml-try><dtml-var my_manage_main_change><dtml-except></dtml-try> 

  • ZMS/trunk/dtml/ZMSMetamodelProvider/manage_main.dtml

    r273 r276  
    1515<!--// 
    1616 
    17   /** 
    18    * 
    19    * @param el 
    20    */ 
    21   function changeType(el)  
    22   { 
    23     disallowBlank(el,"<dtml-var "getZMILangStr('MSG_REQUIRED')%getZMILangStr('ATTR_TYPE')">",false); 
    24     var v = el.options[el.selectedIndex].value; 
    25     var arr = new Array(); 
    26     <dtml-in meta_attrs 
    27      ><dtml-let metadictAttrId=sequence-item metadictAttr="getMetadictAttr(metadictAttrId)" 
    28       ><dtml-if metadictAttr 
    29        >arr['<dtml-var sequence-item>'] = '<dtml-var "metadictAttr['name']">'; 
    30       </dtml-if 
    31      ></dtml-let 
    32     ></dtml-in> 
    33     if (arr[v]) { 
    34       var fm = el.form; 
    35       fm.elements['attr_id'].value = v; 
    36       fm.elements['attr_name'].value = arr[v]; 
     17/** 
     18 * Toggle highlighting of selected rows. 
     19 * 
     20 * @param el 
     21 */ 
     22function toggleRow( el) 
     23{ 
     24  var clazz = "zmiTeaserColor"; 
     25  var els = $("input[@name=ids:list][@type=checkbox]"); 
     26  for (var i = 0; i < els.length; i++) { 
     27    var tr = $($(els[i]).parents("tr")[1]); 
     28    if (els[i].checked) { 
     29      tr.addClass( clazz); 
     30    } 
     31    else { 
     32      tr.removeClass( clazz); 
    3733    } 
    3834  } 
     35} 
     36 
     37/** 
     38 * 
     39 * @param el 
     40 */ 
     41function changeType( el) 
     42{ 
     43  disallowBlank(el,"<dtml-var "getZMILangStr('MSG_REQUIRED')%getZMILangStr('ATTR_TYPE')">",false); 
     44  var v = el.options[el.selectedIndex].value; 
     45  var arr = new Array(); 
     46  <dtml-in meta_attrs 
     47   ><dtml-let metadictAttrId=sequence-item metadictAttr="getMetadictAttr(metadictAttrId)" 
     48    ><dtml-if metadictAttr 
     49     >arr['<dtml-var sequence-item>'] = '<dtml-var "metadictAttr['name']">'; 
     50    </dtml-if 
     51   ></dtml-let 
     52  ></dtml-in> 
     53  if (arr[v]) { 
     54    var fm = el.form; 
     55    fm.elements['attr_id'].value = v; 
     56    fm.elements['attr_name'].value = arr[v]; 
     57  } 
     58} 
    3959 
    4060  /** 
    … …  
    347367   <col /> 
    348368   <col /> 
     369   <col /> 
    349370   <col width="20" /> 
    350371  </colgroup> 
    … …  
    352373  <!-- Header --> 
    353374  <tr> 
    354    <td colspan="6"><dtml-var "f_headline(_,_,headline=getZMILangStr('TAB_EDIT'),extra='<a href='+QUOT+'javascript:exportBtnClick()'+QUOT+'><img src='+QUOT+MISC_ZMS+'mime_type.text_xml.gif'+QUOT+' title='+QUOT+getZMILangStr('BTN_EXPORT')+' (XML)'+QUOT+' border='+QUOT+'1'+QUOT+' align='+QUOT+'absmiddle'+QUOT+'/></a>')"></td> 
     375   <td colspan="7"><dtml-var "f_headline(_,_,headline=getZMILangStr('TAB_EDIT'),extra='<a href='+QUOT+'javascript:exportBtnClick()'+QUOT+'><img src='+QUOT+MISC_ZMS+'mime_type.text_xml.gif'+QUOT+' title='+QUOT+getZMILangStr('BTN_EXPORT')+' (XML)'+QUOT+' border='+QUOT+'1'+QUOT+' align='+QUOT+'absmiddle'+QUOT+'/></a>')"></td> 
    355376  </tr> 
    356377 
    … …  
    381402      <td><div class="form-label">&nbsp;</div></td> 
    382403      <td><div class="form-label"><dtml-var "getZMILangStr('ATTR_DISPLAY')"></div></td> 
     404      <td><div class="form-label"><dtml-var "getZMILangStr('ATTR_VERSION')"></div></td> 
    383405      <td><div class="form-label"><dtml-var "getZMILangStr('ATTR_TYPE')"></div></td> 
    384406      <td><div class="form-label"><dtml-var "getZMILangStr('SOTYPE_ZMSPACKAGE')"></div></td> 
    … …  
    397419      </td> 
    398420      <td><div class="form-element"><dtml-if "metaObj['enabled']==1"><strong></dtml-if><dtml-var "metaObj['name']"><dtml-if "metaObj['enabled']==1"></strong></dtml-if></div></td> 
     421      <td><div class="form-element">v<dtml-var "metaObj.get('revision','0.0.0')"></td> 
    399422      <td><div class="form-element"><dtml-var "getZMILangStr('SOTYPE_%s'%metaObj['type'].upper())"></div></td> 
    400423      <td align="center" 
    … …  
    421444      ></td> 
    422445      <td><dtml-var "getTextInput(fmName='form0',elName='obj_name',size=12,value=metaObj['name'])"></td> 
     446      <td><dtml-var "getTextInput(fmName='form0',elName='obj_revision',size=6,value=metaObj.get('revision','0.0.0'))"></td> 
    423447      <td> 
    424448       <select class="form-element" name="obj_type"> 
    … …  
    442466       ></select> 
    443467      </td> 
    444       <td class="form-element" colspan="2"> 
     468      <td colspan="2" nowrap="nowrap" class="form-element"> 
    445469       <input class="form-submit" name="btn" type="submit" value="<dtml-var "getZMILangStr('BTN_SAVE')" html_quote>" onclick="btnClick(this,'all');"/> 
    446470       <dtml-unless has_acquisition><input class="form-submit" name="btn" type="submit" value="<dtml-var "getZMILangStr('BTN_DELETE')" html_quote>" onclick="btnClick(this,'obj');"/></dtml-unless> 
    … …  
    450474     <!-- Object-Attributes --> 
    451475     <tr class="zmiNeutralColorMedium0"> 
    452       <td colspan="6"> 
     476      <td colspan="7"> 
    453477       <table cellspacing="0" cellpadding="5" border="0" width="90%"> 
    454478       <tr> 
    … …  
    891915     <dtml-if "REQUEST.get('id','') == '' and (metaObj['package'] == '' or metaObj['type'] == 'ZMSPackage')"> 
    892916     <tr valign="top" class="neutralColorWhite"> 
    893       <td colspan="6"> 
     917      <td colspan="7"> 
    894918       <table cellspacing="0" cellpadding="0" border="0" width="100%"> 
    895919        <dtml-let metaObjs="[metaObj]" 
    … …  
    926950               ></dtml-if 
    927951              ></a> 
     952             v<dtml-var "metaObj.get('revision','0.0.0')"> 
    928953             <dtml-unless "metaObj['type'] == 'ZMSPackage'" 
    929954              ><i>(<dtml-var "getZMILangStr('SOTYPE_%s'%metaObj['type'].upper())">)</i 
    … …  
    933958            <dtml-if sequence-start> 
    934959             <td align="right" width="20"> 
    935               <input class="form-checkbox" type="checkbox" name="ids:list" value="<dtml-var "metaObj['id']">" <dtml-if "metaObj.get('acquired',0) == 1">disabled="disabled"</dtml-if>/> 
     960              <input class="form-checkbox" type="checkbox" name="ids:list" value="<dtml-var "metaObj['id']">" <dtml-if "metaObj.get('acquired',0) == 1">disabled="disabled"</dtml-if> onclick="toggleRow(this)"/> 
    936961             </td> 
    937962            </dtml-if> 
    … …  
    951976 <dtml-if "REQUEST.get('id','')==''"> 
    952977  <tr> 
    953    <td colspan="6"><dtml-var "f_headline(_,_,headline=getZMILangStr('BTN_INSERT'))"></td> 
     978   <td colspan="7"><dtml-var "f_headline(_,_,headline=getZMILangStr('BTN_INSERT'))"></td> 
    954979  </tr> 
    955980  <tr class="zmiNeutralColorLight0"> 
    956    <td colspan="6"> 
     981   <td colspan="7"> 
    957982    <table> 
    958983    <tr valign="top"> 
    … …  
    9971022   ><dtml-if res> 
    9981023    <tr> 
    999      <td colspan="6"><dtml-var "f_headline(_,_,headline='%s: %s'%(getZMILangStr('BTN_ACQUIRE'),portalMaster.getHome().id))"></td> 
     1024     <td colspan="7"><dtml-var "f_headline(_,_,headline='%s: %s'%(getZMILangStr('BTN_ACQUIRE'),portalMaster.getHome().id))"></td> 
    10001025    </tr> 
    10011026    <tr class="zmiNeutralColorLight0"> 
    1002      <td colspan="6" class="form-element"> 
     1027     <td colspan="7" class="form-element"> 
    10031028      <table cellspacing="0" cellpadding="0" border="0"> 
    10041029      <tr valign="top"> 
    … …  
    10271052 <dtml-if "REQUEST.get('id','')==''"> 
    10281053  <tr> 
    1029    <td colspan="8"><dtml-var "f_headline(_,_,headline='<img src=%smime_type.text_xml.gif alt=XML border=0 align=absmiddle>&nbsp;%s'%(MISC_ZMS,getZMILangStr('BTN_IMPORT')))"></td> 
     1054   <td colspan="7"><dtml-var "f_headline(_,_,headline='<img src=%smime_type.text_xml.gif alt=XML border=0 align=absmiddle>&nbsp;%s'%(MISC_ZMS,getZMILangStr('BTN_IMPORT')))"></td> 
    10301055  </tr> 
    10311056  <tr class="zmiNeutralColorLight0"> 
    1032    <td colspan="6"> 
     1057   <td colspan="7"> 
    10331058    <table cellspacing="0" cellpadding="2" border="0"> 
    10341059    <tr valign="middle"> 

  • ZMS/trunk/dtml/javascript/comlib.dtml

    r273 r276  
    3838  } 
    3939  window.scrollTo(selectedPosX,selectedPosY); 
     40} 
     41 
     42// ############################################################################# 
     43// ### fireEvent 
     44// ### @see http://www.rakshith.net/blog/?p=35 
     45// ############################################################################# 
     46function fireEvent( el, evtName) { 
     47  //On IE 
     48  if( el.fireEvent) 
     49  { 
     50    el.fireEvent('on'+evtName); 
     51  } 
     52  //On Gecko based browsers 
     53  if(document.createEvent) 
     54  { 
     55    var evt = document.createEvent('HTMLEvents'); 
     56    if(evt.initEvent) 
     57    { 
     58      evt.initEvent(evtName, true, true); 
     59    } 
     60    if ( el.dispatchEvent) 
     61    { 
     62      el.dispatchEvent(evt); 
     63    } 
     64  } 
    4065} 
    4166 

  • ZMS/trunk/dtml/objattrs/f_select_object.dtml

    r121 r276  
    2626      ><div class="form-small" 
    2727       ><dtml-if actions 
    28         ><input class="form-checkbox" type="checkbox" name="ids:list" value="<dtml-var id>" onclick="switchButtons('zmiNeutralColorMedium0')" 
     28        ><input class="form-checkbox" type="checkbox" name="ids:list" value="<dtml-var id>" onclick="switchButtons()" 
    2929       ></dtml-if 
    3030       ><a name="_<dtml-var id>" class="zmi" href="<dtml-var id>/manage_main?lang=<dtml-var lang>" onclick="javascript:return confirmChanges();" title="<dtml-var "getZMILangStr('CAPTION_EDIT')%display_type(REQUEST)">" 

  • ZMS/trunk/dtml/object/f_recordset_grid.dtml

    r273 r276  
    6565       ><img name="<dtml-var key>SortBtn" src="<dtml-var MISC_ZMS>btn_sort_asc0.gif" border="0" align="middle" 
    6666         alt="<dtml-var "getZMILangStr('ATTR_ORDERBY')"> <dtml-var label> (<dtml-var "getZMILangStr('ATTR_DESC')">)" 
    67        /><span class="form-small" style="font-weight:bold;color:black;text-decoration:none;"><i><dtml-var label></i></span 
     67       /><span class="form-small" style="font-weight:bold;color:black;text-decoration:none;"><i><dtml-var "getLangStr(label,lang)"></i></span 
    6868      ></a> 
    6969     <dtml-else> 
    … …  
    7373       ><img name="<dtml-var key>SortBtn" src="<dtml-var MISC_ZMS>btn_sort_desc0.gif" border="0" align="middle" 
    7474         alt="<dtml-var "getZMILangStr('ATTR_ORDERBY')"> <dtml-var label> (<dtml-var "getZMILangStr('ATTR_ASC')">)" 
    75        /><span class="form-small" style="font-weight:bold;color:black;text-decoration:none;"><i><dtml-var label></i></span 
     75       /><span class="form-small" style="font-weight:bold;color:black;text-decoration:none;"><i><dtml-var "getLangStr(label,lang)"></i></span 
    7676      ></a> 
    7777     </dtml-if> 
    … …  
    7979     <a href="<dtml-var "url_append_params(grid_url,{'lang':lang,'qsize:int':qsize,'qorder':key})">" style="color:black" 
    8080        title="<dtml-var "getZMILangStr('ATTR_ORDERBY')"> <dtml-var label>" 
    81       ><span class="form-small" style="font-weight:bold;color:black;text-decoration:none;"><dtml-var label></span 
     81      ><span class="form-small" style="font-weight:bold;color:black;text-decoration:none;"><dtml-var "getLangStr(label,lang)"></span 
    8282     ></a> 
    8383    </dtml-if> 
    8484   <dtml-else> 
    85     <b><dtml-var label></b> 
     85    <b><dtml-var "getLangStr(label,lang)"></b> 
    8686   </dtml-if> 
    8787  </th> 
    … …  
    9292 </tr> 
    9393 <dtml-except> 
    94   [f_recordset_grid]: Unexpected Exception - <dtml-var error_type>: <dtml-var error_value> --> 
     94  [f_recordset_grid]: Unexpected Exception - <dtml-var error_type>: <dtml-var error_value> 
    9595 </dtml-try> 
    9696 

  • ZMS/trunk/import/zms.metaobj.xml

    r273 r276  
    207207<item key="id"><![CDATA[ZMS]]></item> 
    208208<item key="name"><![CDATA[ZMS]]></item> 
     209<item key="revision"><![CDATA[1.0.0]]></item> 
    209210<item key="package"><![CDATA[com.zms.foundation]]></item> 
    210211<item key="type"><![CDATA[ZMSDocument]]></item> 
    … …  
    400401<item key="id"><![CDATA[ZMSDocument]]></item> 
    401402<item key="name"><![CDATA[ZMSDocument]]></item> 
     403<item key="revision"><![CDATA[1.0.0]]></item> 
    402404<item key="package"><![CDATA[com.zms.foundation]]></item> 
    403405<item key="type"><![CDATA[ZMSDocument]]></item> 
    … …  
    641643<item key="id"><![CDATA[ZMSFile]]></item> 
    642644<item key="name"><![CDATA[ZMSFile]]></item> 
     645<item key="revision"><![CDATA[1.0.0]]></item> 
    643646<item key="package"><![CDATA[com.zms.foundation]]></item> 
    644647<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    844847<item key="id"><![CDATA[ZMSFolder]]></item> 
    845848<item key="name"><![CDATA[ZMSFolder]]></item> 
     849<item key="revision"><![CDATA[1.0.0]]></item> 
    846850<item key="package"><![CDATA[com.zms.foundation]]></item> 
    847851<item key="type"><![CDATA[ZMSDocument]]></item> 
    … …  
    10281032<item key="id"><![CDATA[ZMSGraphic]]></item> 
    10291033<item key="name"><![CDATA[ZMSGraphic]]></item> 
     1034<item key="revision"><![CDATA[1.0.0]]></item> 
    10301035<item key="package"><![CDATA[com.zms.foundation]]></item> 
    10311036<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    10661071<item key="id"><![CDATA[ZMSLib]]></item> 
    10671072<item key="name"><![CDATA[ZMSLib]]></item> 
     1073<item key="revision"><![CDATA[1.0.0]]></item> 
    10681074<item key="package"><![CDATA[com.zms.foundation]]></item> 
    10691075<item key="type"><![CDATA[ZMSLibrary]]></item> 
    … …  
    12411247<item key="id"><![CDATA[ZMSLinkContainer]]></item> 
    12421248<item key="name"><![CDATA[ZMSLinkContainer]]></item> 
     1249<item key="revision"><![CDATA[1.0.0]]></item> 
    12431250<item key="package"><![CDATA[com.zms.foundation]]></item> 
    12441251<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    15981605<item key="id"><![CDATA[ZMSLinkElement]]></item> 
    15991606<item key="name"><![CDATA[ZMSLinkElement]]></item> 
     1607<item key="revision"><![CDATA[1.0.0]]></item> 
    16001608<item key="package"><![CDATA[com.zms.foundation]]></item> 
    16011609<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    16731681<item key="id"><![CDATA[ZMSNote]]></item> 
    16741682<item key="name"><![CDATA[ZMSNote]]></item> 
     1683<item key="revision"><![CDATA[1.0.0]]></item> 
    16751684<item key="package"><![CDATA[com.zms.foundation]]></item> 
    16761685<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    17191728<item key="id"><![CDATA[ZMSSqlDb]]></item> 
    17201729<item key="name"><![CDATA[ZMSSqlDb]]></item> 
     1730<item key="revision"><![CDATA[1.0.0]]></item> 
    17211731<item key="package"><![CDATA[com.zms.foundation]]></item> 
    17221732<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    20492059<item key="id"><![CDATA[ZMSSysFolder]]></item> 
    20502060<item key="name"><![CDATA[ZMSSysFolder]]></item> 
     2061<item key="revision"><![CDATA[1.0.0]]></item> 
    20512062<item key="package"><![CDATA[com.zms.foundation]]></item> 
    20522063<item key="type"><![CDATA[ZMSDocument]]></item> 
    … …  
    28822893<item key="id"><![CDATA[ZMSTable]]></item> 
    28832894<item key="name"><![CDATA[ZMSTable]]></item> 
     2895<item key="revision"><![CDATA[1.0.0]]></item> 
    28842896<item key="package"><![CDATA[com.zms.foundation]]></item> 
    28852897<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    32553267<item key="id"><![CDATA[ZMSTeaserContainer]]></item> 
    32563268<item key="name"><![CDATA[ZMSTeaserContainer]]></item> 
     3269<item key="revision"><![CDATA[1.0.0]]></item> 
    32573270<item key="package"><![CDATA[com.zms.foundation]]></item> 
    32583271<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    34813494<item key="id"><![CDATA[ZMSTeaserElement]]></item> 
    34823495<item key="name"><![CDATA[ZMSTeaserElement]]></item> 
     3496<item key="revision"><![CDATA[1.0.0]]></item> 
    34833497<item key="package"><![CDATA[com.zms.foundation]]></item> 
    34843498<item key="type"><![CDATA[ZMSTeaserElement]]></item> 
    … …  
    36003614<item key="id"><![CDATA[ZMSTextarea]]></item> 
    36013615<item key="name"><![CDATA[ZMSTextarea]]></item> 
     3616<item key="revision"><![CDATA[1.0.0]]></item> 
    36023617<item key="package"><![CDATA[com.zms.foundation]]></item> 
    36033618<item key="type"><![CDATA[ZMSObject]]></item> 
    … …  
    36163631<item key="id"><![CDATA[com.zms.foundation]]></item> 
    36173632<item key="name"><![CDATA[com.zms.foundation]]></item> 
     3633<item key="revision"><![CDATA[1.0.0]]></item> 
    36183634<item key="package"/> 
    36193635<item key="type"><![CDATA[ZMSPackage]]></item> 

  • ZMS/trunk/zms.py

    r252 r276  
    604604    # ------------- 
    605605    zms_build = '131'           # Internal use only, designates object model! 
    606     zms_patch = 'g'             # Internal use only! 
     606    zms_patch = 'h'             # Internal use only! 
    607607 
    608608    # Properties. 
    … …  
    897897        message += 'Synchronized object-model from patch #%s%s to #%s%s!<br/>'%(build,patch,self.zms_build,self.zms_patch) 
    898898      if maintenance: 
    899         self.getTrashcan().run_garbage_collection() 
     899        try: 
     900          self.getTrashcan().run_garbage_collection() 
     901        except: 
     902          _globals.writeException( self, '[updateVersion]: can\'t run garbage collection') 
    900903       
    901904      # Process clients. 

  • ZMS/trunk/zmscontainerobject.py

    r273 r276  
    122122    # ---------- 
    123123    pageelement_TOC = HTMLFile('dtml/ZMSContainerObject/pageelement_toc', globals()) 
    124      
     124 
    125125    # Management Interface. 
    126126    # --------------------- 
    127     main_js = HTMLFile('dtml/ZMSContainerObject/main_js', globals()) # JavaScript 
    128     manage_main = HTMLFile('dtml/ZMSContainerObject/manage_main', globals())  
    129     manage_main_btn = HTMLFile('dtml/ZMSContainerObject/manage_main_btn', globals()) # Buttons 
    130     manage_main_change = HTMLFile('dtml/ZMSContainerObject/manage_main_change', globals()) # Change (Author & Date) 
    131     manage_main_actions = HTMLFile('dtml/ZMSContainerObject/manage_main_actions', globals()) # Actions 
    132     manage_search = HTMLFile('dtml/ZMSContainerObject/manage_search', globals())  
    133     manage_search_attrs = HTMLFile('dtml/ZMSContainerObject/manage_search_attrs', globals())  
     127    manage_main_btn = HTMLFile('dtml/ZMSContainerObject/manage_main_btn', globals()) 
     128    manage_main_change = HTMLFile('dtml/ZMSContainerObject/manage_main_change', globals()) 
     129    manage_main_actions = HTMLFile('dtml/ZMSContainerObject/manage_main_actions', globals()) 
     130    main_js = HTMLFile('dtml/ZMSContainerObject/main_js', globals()) 
     131    manage_main = HTMLFile('dtml/ZMSContainerObject/manage_main', globals()) 
     132    manage_search = HTMLFile('dtml/ZMSContainerObject/manage_search', globals()) 
     133    manage_search_attrs = HTMLFile('dtml/ZMSContainerObject/manage_search_attrs', globals()) 
    134134    manage_properties = HTMLFile('dtml/ZMSObject/manage_main', globals()) 
    135135    manage_system = HTMLFile('dtml/ZMSContainerObject/manage_system', globals()) 
    136     manage_importexport = HTMLFile('dtml/ZMSContainerObject/manage_importexport', globals())  
    137     manage_importexportFtp = HTMLFile('dtml/ZMSContainerObject/manage_importexportftp', globals())  
     136    manage_importexport = HTMLFile('dtml/ZMSContainerObject/manage_importexport', globals()) 
     137    manage_importexportFtp = HTMLFile('dtml/ZMSContainerObject/manage_importexportftp', globals()) 
    138138 
    139139 
    140140    # Sitemap. 
    141141    # -------- 
    142     sitemap_layout0 = HTMLFile('dtml/ZMSContainerObject/sitemap/version0', globals())  
    143     sitemap_layout1 = HTMLFile('dtml/ZMSContainerObject/sitemap/version1', globals())  
     142    sitemap_layout0 = HTMLFile('dtml/ZMSContainerObject/sitemap/version0', globals()) 
     143    sitemap_layout1 = HTMLFile('dtml/ZMSContainerObject/sitemap/version1', globals()) 
    144144    sitemap_layout2 = HTMLFile('dtml/ZMSContainerObject/sitemap/version2', globals()) 
    145145    sitemap_layout3 = HTMLFile('dtml/ZMSContainerObject/sitemap/version3', globals()) 
Note: See TracChangeset for help on using the changeset viewer.