Changeset 455

Show
Ignore:
Timestamp:
05/05/06 11:10:02
Author:
douglm
Message:

Fix user prefs so they partially work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

    r454 r455  
    684684               scope="session" 
    685685               validate="false"> 
    686       <forward name="notFound" path="/admin/showMain.rdo" redirect="true" /> 
     686      <forward name="notFound" path="/showMain.rdo" redirect="true" /> 
    687687      <forward name="success" path="/prefs/showModForm.rdo" redirect="true" /> 
    688688    </action> 
    …… 
    693693               scope="session" 
    694694               validate="false"> 
    695       <forward name="cancelled" path="/admin/showMain.rdo" redirect="true" /> 
     695      <forward name="cancelled" path="/showMain.rdo" redirect="true" /> 
    696696      <forward name="retry" path="/prefs/showModForm.rdo" /> 
    697       <forward name="success" path="/admin/showMain.rdo" redirect="true" /> 
     697      <forward name="notFound" path="/prefs/showModForm.rdo" /> 
     698      <forward name="success" path="/showMain.rdo" redirect="true" /> 
    698699    </action> 
    699700 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java

    r449 r455  
    5555package org.bedework.webcommon.pref; 
    5656 
     57import org.bedework.calfacade.BwCalendar; 
    5758import org.bedework.calfacade.BwUser; 
    5859import org.bedework.calfacade.svc.BwPreferences; 
    …… 
    6970 * <p>Parameters are:<ul> 
    7071 *      <li>"user"             User whos prefs we're changing - superuser only</li> 
    71  *      <li>"view"             Name of preferred view</li> 
     72 *      <li>"preferredView"    Name of preferred view</li> 
    7273 *      <li>"viewPeriod"       day/week/month/year</li> 
    7374 *      <li>"skin"             Name of default skin</li> 
    …… 
    7778 *      <li>"calPath"          Path to default calendar</li> 
    7879 *      <li>"userMode"         User interface mode</li> 
    79  *      <li>"workDays"         7-character string representing workdays, "W" representing each workday, space otherwise; e.g. " WWWWW " is a typical Mon-Fri workweek</li> 
     80 *      <li>"workDays"         7-character string representing workdays, 
     81 *                             "W" representing each workday, space otherwise; 
     82 *                             e.g. " WWWWW " is a typical Mon-Fri workweek</li> 
    8083 *      <li>"workDayStart"     In minutes, e.g. e.g. 14:30 is 870 and 17:30 is 1050</li> 
    8184 *      <li>"workDayEnd"       In minutes</li> 
    …… 
    147150    } 
    148151 
     152    str = getReqPar(request, "email"); 
     153    if (str != null) { 
     154      prefs.setEmail(str); 
     155    } 
     156 
     157    /* 
     158    str = getReqPar(request, "calPath"); 
     159    if (str != null) { 
     160      BwCalendar cal = svc.getCalendar(str); 
     161      if (cal == null) { 
     162        form.getErr().emit("org.bedework.client.error.nosuchcalendar", str); 
     163        return "notFound"; 
     164      } 
     165      prefs.setDefaultCalendar(cal); 
     166    } 
     167    */ 
     168 
    149169    svc.updateUserPrefs(prefs); 
    150170    form.getMsg().emit("org.bedework.client.message.prefs.updated");