Changeset 451

Show
Ignore:
Timestamp:
05/05/06 09:15:09
Author:
douglm
Message:

Fix getEncodedPath so a null path doesn't break it (new folder/calendar)
Add new/updated folder confirmation messages to the client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/BwCalendar.java

    r445 r451  
    403403   */ 
    404404  public String getEncodedPath() throws CalFacadeException { 
     405    if (getPath() == null) { 
     406      return null; 
     407    } 
    405408    try { 
    406409      return URLEncoder.encode(getPath(), "UTF-8"); 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java

    r445 r451  
    132132    } 
    133133 
    134     if (add) { 
    135       form.getMsg().emit("org.bedework.client.message.calendar.added"); 
     134    if (cal.getCalendarCollection()) { 
     135      if (add) { 
     136        form.getMsg().emit("org.bedework.client.message.calendar.added"); 
     137      } else { 
     138        form.getMsg().emit("org.bedework.client.message.calendar.updated"); 
     139      } 
    136140    } else { 
    137       form.getMsg().emit("org.bedework.client.message.calendar.updated"); 
     141      if (add) { 
     142        form.getMsg().emit("org.bedework.client.message.folder.added"); 
     143      } else { 
     144        form.getMsg().emit("org.bedework.client.message.folder.updated"); 
     145      } 
    138146    } 
    139147