Changeset 273


Ignore:
Timestamp:
05.11.2008 14:07:36 (3 years ago)
Author:
chris
Message:

zms-2.11.1-13

Location:
ZMS/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • ZMS/trunk/_cachemanager.py

    r121 r273  
    142142    # -------------------------------------------------------------------------- 
    143143    def fetchReqBuff(self, key, REQUEST, forced=False): 
    144       if forced or REQUEST.get('URL','/manage').find('/manage') < 0: 
     144      url = REQUEST.get('URL','/manage') 
     145      url = url[url.rfind('/'):] 
     146      if forced or not url.find('/manage') >= 0: 
    145147        buff = getReqBuff(self,REQUEST) 
    146148        reqBuffId = getReqBuffId(self,key,REQUEST) 

  • ZMS/trunk/_confmanager.py

    r252 r273  
    435435              v = self.parseXmlString(self.getXmlHeader() + v) 
    436436              self.setConfProperty( k, v) 
     437              if REQUEST.get('portal_clients'): 
     438                for portalClient in self.getPortalClients(): 
     439                  portalClient.setConfProperty( k, v) 
    437440            except: 
    438441              _globals.writeException( self, "[manage_customizeSystem]: can't set conf-property %s=%s"%(str(k),str(v))) 
    … …  
    443446            v = REQUEST.get( 'value', '') 
    444447            self.setConfProperty( k, v) 
     448            if REQUEST.get('portal_clients'): 
     449              for portalClient in self.getPortalClients(): 
     450                portalClient.setConfProperty( k, v) 
    445451            message = self.getZMILangStr('MSG_CHANGED') 
    446452            params.append( 'option') 

  • ZMS/trunk/changes.txt

    r267 r273  
    102310232008-11-03:zms-2.11.1-12 
    10241024[01113] Added support for dynamic icons (requested by tf). 
    1025 -------------------------------------------------- 
     1025[01114] Added support for saving system-configuration in portal-clients. 
     1026-------------------------------------------------- 
     10272008-11-05:zms-2.11.1-13 
     1028[01115] Revised special-object 'TeX' (requested by desy). 
     1029-------------------------------------------------- 

  • ZMS/trunk/dtml/ZMS/manage_customize.dtml

    r267 r273  
    346346      <dtml-var "getTextInput(fmName='customForm',elName='value',value=getConfProperty(key,item.get('default','')),size=15,enabled=1,REQUEST=REQUEST,css='form-small')"> 
    347347     </dtml-if> 
     348     <dtml-if "getPortalClients()"> 
     349      <input class="form-checkbox" type="checkbox" name="portal_clients" value="portal_clients"<dtml-if "REQUEST.form.get('portal_clients')"> checked="checked"</dtml-if>>&nbsp;Clients&nbsp;&nbsp;&nbsp; 
     350     </dtml-if> 
    348351     <input class="form-submit" type="submit" name="btn" value="Change"> 
    349352    </td> 

  • ZMS/trunk/dtml/ZMSSqlDb/input_details.dtml

    r267 r273  
    129129   ><dtml-call "sqlStatement.append( 'ORDER BY sort_id')" 
    130130  ></dtml-if 
    131   ><dtml-try 
    132    ><dtml-call "REQUEST.set('res',query(' '.join(sqlStatement))['records'])" 
    133   ><dtml-except 
     131  ><!-- input_details.dtml.SQL: <dtml-var sqlStatement> --> 
     132  <dtml-try 
     133   ><dtml-call "REQUEST.set('res',query(' '.join(sqlStatement))['records'])"> 
     134  <dtml-except 
    134135   ><div class="form-fixed" style="border: 1px solid black; background-color:white;color: red; margin:2px; padding:2px;">SQLException - Can't select records: <dtml-var error_type html_quote>: <dtml-var error_value html_quote><br/><dtml-var error_tb newline_to_br html_quote></div 
    135136  ></dtml-try> 
    … …  
    137138  <dtml-call "REQUEST.set('rindex',-1)" 
    138139  ><dtml-if "REQUEST.get('details_action')=='update'" 
    139    ><dtml-in res mapping 
     140   ><dtml-in "REQUEST['res']" mapping 
    140141    ><dtml-if "_.str(_[primary_key])==_.str(details_rowid)" 
    141142     ><dtml-call "REQUEST.set('rindex',_['sequence-index'])" 
    … …  
    158159   </dtml-if> 
    159160   <dtml-var "f_recordset_grid(_,_ 
     161     ,res=REQUEST['res'] 
    160162     ,grid_url=URL 
    161163     ,grid_cols=grid_cols 
    … …  
    170172><dtml-call "REQUEST.set('details_submit',getZMILangStr('BTN_INSERT'))" 
    171173><dtml-if "REQUEST.get('details_action')=='update'" 
    172  ><dtml-in res mapping 
     174 ><dtml-in "REQUEST['res']" mapping 
    173175  ><dtml-call "REQUEST.set('row',_['sequence-item'])" 
    174176  ><dtml-call f_recordset_init 

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

    r240 r273  
    5151  function highlight_text(text) { 
    5252     var exp = ""; 
    53      for (var i = 0; i < text.length; i++)  
    54        exp += "(" + text.charAt(i) + "|" + text.toUpperCase().charAt(i) + "|" + text.toLowerCase().charAt(i) + ")"; 
     53     for (var i = 0; i < text.length; i++) { 
     54       var ch = text.charAt(i); 
     55       if ( ch != '*') { 
     56         exp += "(" + ch + "|" + text.toUpperCase().charAt(i) + "|" + text.toLowerCase().charAt(i) + ")"; 
     57       } 
     58     } 
    5559     var regexp = new RegExp( "(" + exp + ")", "g"); 
    5660     var el = document.getElementsByTagName("body")[0]; 

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

    r267 r273  
    1 <dtml-comment> 
     1<!-- 
    22############################################################################### 
    33### 
    … …  
    55###    
    66###   @explicit-param grid_url[string] 
    7 ###   @explicit-param grid_cols[list] 
     7###   @explicit-param grid_cols[list]: <dtml-var grid_cols> 
    88###   @implicit-param qsize[int] 
    99###   @implicit-param qorder[string] 
    1010###   @implicit-param qorderdir[string]         desc|asc 
    1111###   @implicit-param qstart[int] 
    12 ###   @implicit-param res[list] 
     12###   @implicit-param res[list] <dtml-var "_.len(res)"> 
    1313###   @implicit-param REQUEST[HttpRequest] 
    1414### 
    1515############################################################################### 
    16 </dtml-comment> 
     16--> 
    1717 
    1818 <dtml-var f_recordset_nav> 
    … …  
    2323   <col width="<dtml-var "_.max( 
    2424     _.len(_.filter(lambda x: x in ['insert','export'],grid_options.keys())), 
    25      _.len(_.filter(lambda x: x in ['delete','sort','update','choose'],grid_options.keys())))*22">/> 
     25     _.len(_.filter(lambda x: x in ['delete','sort','update','choose'],grid_options.keys())))*22">"/> 
    2626  </dtml-if> 
    2727  <dtml-in grid_cols mapping> 

  • ZMS/trunk/dtml/object/f_recordset_nav.dtml

    r121 r273  
    1 <dtml-comment> 
     1<!-- 
    22############################################################################### 
    33### 
    … …  
    99###   @implicit-param qorderdir[string]         desc|asc 
    1010###   @implicit-param qstart[int] 
    11 ###   @implicit-param res[list] 
     11###   @implicit-param res[list]: <dtml-var "_.len(res)"> 
    1212###   @implicit-param REQUEST[HttpRequest] 
    1313### 
    1414############################################################################### 
    15 </dtml-comment> 
     15--> 
    1616 
    1717<dtml-try> 

  • ZMS/trunk/version.txt

    r267 r273  
    1 ZMS 2.11.1-12 
     1ZMS 2.11.1-13 

  • ZMS/trunk/zmssqldb.py

    r267 r273  
    526526      REQUEST.set('grid_cols',[]) 
    527527      sqlStatement = REQUEST.get('sqlStatement',[]) 
     528      if type(sqlStatement) is not list: 
     529        sqlStatement = [] 
    528530      if len(tabledefs) > 0: 
    529531        if tablename not in map( lambda x: x['id'], tabledefs): 
Note: See TracChangeset for help on using the changeset viewer.