Changeset 255

Show
Ignore:
Timestamp:
03/03/06 09:49:10
Author:
douglm
Message:

Null view name now causes error message. Other related fixes. Fixed forwarding also.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r244 r255  
    388388               validate="false"> 
    389389      <forward name="delete" path="/view/showDeleteConfirm.rdo" redirect="true" /> 
     390      <forward name="retry" path="/view/showViews.rdo" redirect="true" /> 
    390391      <forward name="success" path="/view/showModForm.rdo" redirect="true" /> 
    391392    </action> 
    …… 
    396397               scope="session" 
    397398               validate="false"> 
     399      <forward name="retry" path="/view/showModForm.rdo" redirect="true" /> 
    398400      <forward name="success" path="/view/showModForm.rdo" redirect="true" /> 
    399401    </action> 
    …… 
    404406               scope="session" 
    405407               validate="false"> 
     408      <forward name="notAdded" path="/view/showViews.rdo" redirect="true" /> 
    406409      <forward name="success" path="/view/showModForm.rdo" redirect="true" /> 
    407410    </action> 
    …… 
    413416               validate="false"> 
    414417      <forward name="cancelled" path="/view/showViews.rdo" redirect="true" /> 
     418      <forward name="retry" path="/view/showViews.rdo" redirect="true" /> 
    415419      <forward name="success" path="/view/showViews.rdo" redirect="true" /> 
    416420    </action> 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/AddViewAction.java

    r55 r255  
    9292 
    9393    CalSvcI svc = form.fetchSvci(); 
    94     String name = request.getParameter("name"); 
     94    String name = getReqPar(request, "name"); 
    9595 
    9696    if (name == null) { 
    9797      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    98       return "error"; 
     98      return "notAdded"; 
    9999    } 
    100100 
    101101    boolean makeDefaultView = false; 
    102102 
    103     String str = request.getParameter("makedefaultview"); 
     103    String str = getReqPar(request, "makedefaultview"); 
    104104    if (str != null) { 
    105105      makeDefaultView = str.equals("y"); 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/DeleteViewAction.java

    r55 r255  
    7373 *      <li>"noAccess"     user not authorised.</li> 
    7474 *      <li>"notFound"     no such subscription.</li> 
     75 *      <li>"retry"        try again.</li> 
    7576 *      <li>"success"      subscribed ok.</li> 
    7677 * </ul> 
    …… 
    9293    CalSvcI svc = form.fetchSvci(); 
    9394 
    94     String name = request.getParameter("name"); 
     95    String name = getReqPar(request, "name"); 
    9596 
    9697    if (name == null) { 
    9798      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    98       return "error"; 
     99      return "retry"; 
    99100    } 
    100101 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/FetchViewAction.java

    r55 r255  
    7373 *      <li>"noAccess"     user not authorised.</li> 
    7474 *      <li>"notFound"     no such subscription.</li> 
     75 *      <li>"retry"        try again.</li> 
    7576 *      <li>"success"      subscribed ok.</li> 
    7677 * </ul> 
    …… 
    8889    CalSvcI svc = form.fetchSvci(); 
    8990 
    90     String name = request.getParameter("name"); 
     91    String name = getReqPar(request, "name"); 
    9192 
    9293    if (name == null) { 
    9394      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    94       return "error"; 
     95      return "retry"; 
    9596    } 
    9697 
    …… 
    105106    form.setSubscriptions(svc.getSubscriptions()); 
    106107 
    107     String reqpar = request.getParameter("delete"); 
     108    String reqpar = getReqPar(request, "delete"); 
    108109 
    109110    if (reqpar != null) { 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/UpdateViewAction.java

    r55 r255  
    6161import org.bedework.webcommon.BwSession; 
    6262 
    63 import edu.rpi.sss.util.Util; 
    64  
    6563import javax.servlet.http.HttpServletRequest; 
    6664import javax.servlet.http.HttpServletResponse; 
    …… 
    7977 *      <li>"noAccess"     user not authorised.</li> 
    8078 *      <li>"notAdded"     duplicate or bad name.</li> 
     79 *      <li>"retry"        try again.</li> 
    8180 *      <li>"success"      subscribed ok.</li> 
    8281 * </ul> 
    …… 
    9796 
    9897    CalSvcI svc = form.fetchSvci(); 
    99     String name = Util.checkNull(request.getParameter("name")); 
     98    String name = getReqPar(request, "name"); 
     99     
    100100    if (name == null) { 
    101101      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    102       return "error"; 
     102      return "retry"; 
    103103    } 
    104104 
    105     String add = Util.checkNull(request.getParameter("add")); 
    106     String remove = Util.checkNull(request.getParameter("remove")); 
     105    String add = getReqPar(request, "add"); 
     106    String remove = getReqPar(request, "remove"); 
    107107 
    108108    if (add != null) {