Changeset 18345

Show
Ignore:
Timestamp:
11/13/08 07:49:48 (2 months ago)
Author:
umesha
Message:

bug-492 Page cannot be displayed" on choosing the Cancel button in the Select file to import page
bug367 Clicking Return button from document error page halts the application
and some others

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/config/spring/tiles-definitions.xml

    r17787 r18345  
    1515         
    1616        <definition name="/tiles_logo_upload_validation" path="/project/AddProjectLogo.jsp"> 
     17        </definition> 
     18         
     19        <definition name="/tiles_csv_stepone" path="/datatransform/csv/FileUpload.jsp"> 
    1720        </definition> 
    1821         

  • trunk/core/src/net/project/datatransform/csv/CSVUpload.java

    r18316 r18345  
    5858                session.setAttribute("csvWizard", csvWizard); 
    5959            } 
     60             
    6061            if(cuCommand.getFile() == null || cuCommand.getFile().isEmpty()) { 
    61                     csvWizard.invalidateFormat(); 
    62                     response.sendRedirect(SessionManager.getJSPRootURL() + "/datatransform/csv/FileUpload.jsp"); 
     62                csvWizard.invalidateFormat(); 
     63                Map model = new HashMap(); 
     64                return new ModelAndView("/tiles_csv_stepone", model); 
    6365            } 
    6466             

  • trunk/core/web/jsp/document/ErrorCheckInByWrongUser.jsp

    r17946 r18345  
    5050<head> 
    5151<title><display:get name="prm.document.errorcheckinbywronguser.label" /></title> 
     52<link rel="stylesheet" rev="stylesheet" type="text/css" href="/pnet/styles/global.css?8.5"> 
     53<link rel="stylesheet" rev="stylesheet" type="text/css" href="/pnet/styles/fonts.css?8.5"> 
    5254 
    5355</head> 

  • trunk/core/web/jsp/document/ErrorCheckInOutGeneral.jsp

    r17946 r18345  
    2828<head> 
    2929<title><display:get name="prm.document.errorcheckinoutgeneral.title" /></title> 
     30<link rel="stylesheet" rev="stylesheet" type="text/css" href="/pnet/styles/global.css?8.5"> 
     31<link rel="stylesheet" rev="stylesheet" type="text/css" href="/pnet/styles/fonts.css?8.5"> 
    3032 
    3133</head> 

  • trunk/core/web/jsp/document/ErrorCheckOutAlreadyCKO.jsp

    r18316 r18345  
    5050<head> 
    5151<title><display:get name="prm.document.errorcheckoutalready.title" /></title> 
     52<link rel="stylesheet" rev="stylesheet" type="text/css" href="/pnet/styles/global.css?8.5"> 
     53<link rel="stylesheet" rev="stylesheet" type="text/css" href="/pnet/styles/fonts.css?8.5"> 
    5254 
    5355</head> 

  • trunk/core/web/jsp/document/ImportObject.jsp

    r17995 r18345  
    9999        var filePathEmpty = "<%=PropertyProvider.get("prm.document.importobject.file.empty")%>"; 
    100100                 
    101         // this is to avoid security issue for importing new document by using back button (fix fix this page only.) 
    102         window.history.forward(1); 
    103  
    104101    function setup() { 
    105102        load_menu('<%=user.getCurrentSpace().getID()%>'); 

  • trunk/core/web/jsp/form/designer/FormDefinitionUpload.jsp

    r18270 r18345  
    5050} 
    5151 
    52 function cancel() { 
    53         var theLocation='<%=SessionManager.getJSPRootURL()%>Main.jsp?module=30&action=2'; 
    54         self.location = theLocation; 
    55 } 
     52 
    5653function next () { 
    5754    theForm = self.document.forms[0]; 
    …… 
    126123<tb:toolbar style="action" showLabels="true" bottomFixed="true"> 
    127124        <tb:band name="action"> 
    128             <tb:button type="cancel" /> 
    129125            <tb:button type="next" /> 
    130126        </tb:band>