Changeset 533

Show
Ignore:
Timestamp:
06/05/06 10:54:12
Author:
douglm
Message:

Allow admin to update max public and user description lengths

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl

    r527 r533  
    23882388        </tr> 
    23892389        <tr> 
     2390          <th>Maximum length of public event description:</th> 
     2391          <td> 
     2392            <xsl:variable name="maxPublicDescriptionLength" select="/bedeworkadmin/system/maxPublicDescriptionLength"/> 
     2393            <input value="{$maxPublicDescriptionLength}" name="maxPublicDescriptionLength" size="20"/> 
     2394          </td> 
     2395          <td> 
     2396          </td> 
     2397        </tr> 
     2398        <tr> 
     2399          <th>Maximum length of user event description:</th> 
     2400          <td> 
     2401            <xsl:variable name="maxUserDescriptionLength" select="/bedeworkadmin/system/maxUserDescriptionLength"/> 
     2402            <input value="{$maxUserDescriptionLength}" name="maxUserDescriptionLength" size="20"/> 
     2403          </td> 
     2404          <td> 
     2405          </td> 
     2406        </tr> 
     2407        <tr> 
     2408          <th>Maximum size of a user entity:</th> 
     2409          <td> 
     2410            <xsl:variable name="maxUserEntitySize" select="/bedeworkadmin/system/maxUserEntitySize"/> 
     2411            <input value="{$maxUserEntitySize}" name="maxUserEntitySize" size="20"/> 
     2412          </td> 
     2413          <td> 
     2414          </td> 
     2415        </tr> 
     2416        <tr> 
    23902417          <th>Default user quota:</th> 
    23912418          <td> 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/system/UpdateSysparsAction.java

    r448 r533  
    145145    } 
    146146 
     147    intVal = getIntReqPar(request, "maxPublicDescriptionLength", -1); 
     148    if (intVal >= 0) { 
     149      syspars.setMaxPublicDescriptionLength(intVal); 
     150      changed = true; 
     151    } 
     152 
     153    intVal = getIntReqPar(request, "maxUserDescriptionLength", -1); 
     154    if (intVal >= 0) { 
     155      syspars.setMaxUserDescriptionLength(intVal); 
     156      changed = true; 
     157    } 
     158 
     159    intVal = getIntReqPar(request, "maxUserEntitySize", -1); 
     160    if (intVal >= 0) { 
     161      syspars.setMaxUserEntitySize(intVal); 
     162      changed = true; 
     163    } 
     164 
    147165    long longVal = getLongReqPar(request, "defaultUserQuota", -1); 
    148166    if (longVal >= 0) { 

  • trunk/calendar3/webadmin/war/docs/system/modSyspars.jsp

    r169 r533  
    33<%@ taglib uri='struts-html' prefix='html' %> 
    44<%@ taglib uri='struts-genurl' prefix='genurl' %> 
     5<%@ taglib uri='bedework' prefix='bw' %> 
    56<html:xhtml/> 
    67 
    …… 
    1011<bean:define id="systemParams" name="peForm" property="syspars"/> 
    1112<system> 
    12   <tzid><bean:write name="systemParams" property="tzid"/></tzid> 
    13   <defaultUserViewName><bean:write name="systemParams" property="defaultUserViewName"/></defaultUserViewName> 
    14   <httpConnectionsPerUser><bean:write name="systemParams" property="httpConnectionsPerUser"/></httpConnectionsPerUser> 
    15   <httpConnectionsPerHost><bean:write name="systemParams" property="httpConnectionsPerHost"/></httpConnectionsPerHost> 
    16   <httpConnections><bean:write name="systemParams" property="httpConnections"/></httpConnections> 
    17   <defaultUserQuota><bean:write name="systemParams" property="defaultUserQuota"/></defaultUserQuota> 
     13  <bw:emitText name="systemParams" property="tzid"/> 
     14  <bw:emitText name="systemParams" property="defaultUserViewName"/> 
     15  <bw:emitText name="systemParams" property="httpConnectionsPerUser"/> 
     16  <bw:emitText name="systemParams" property="httpConnectionsPerHost"/> 
     17  <bw:emitText name="systemParams" property="httpConnections"/> 
     18  <bw:emitText name="systemParams" property="maxPublicDescriptionLength"/> 
     19  <bw:emitText name="systemParams" property="maxUserDescriptionLength"/> 
     20  <bw:emitText name="systemParams" property="maxUserEntitySize"/> 
     21  <bw:emitText name="systemParams" property="defaultUserQuota"/> 
    1822</system> 
    1923 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/NameScopePropertyTag.java

    r415 r533  
    9999   */ 
    100100  protected String getString(boolean required) throws JspTagException { 
    101     return (String)getObject(name, scope, property, required); 
     101    return String.valueOf(getObject(name, scope, property, required)); 
    102102  } 
    103103}