Project

General

Profile

« Previous | Next » 

Revision 4406

Added by daigle about 16 years ago

Add support email to configuration error messages

View differences:

lib/admin/database-configuration.jsp
32 32 
	MetaCatVersion metacatVersion = (MetaCatVersion)request.getAttribute("metacatVersion");
33 33 
	DBVersion databaseVersion = (DBVersion)request.getAttribute("databaseVersion");
34 34 
	Vector<String> updateScriptList = (Vector<String> )request.getAttribute("updateScriptList");
35 
	String supportEmail = (String)request.getAttribute("supportEmail");
35 36 
%>
36 37 

  		




  37
  38
  
    
<html>


  		




  ......




  54
  55
  
    
%>


  		




  55
  56
  
    
     The system has detected that this is a new database. <br><br>


  		




  56
  57
  
    
     Please hit the Continue button to upgrade your database to version: <%= metacatVersion.getVersionString() %>. <br><br>


  		




  57
  
  
    
     <div class=warning>Warning: this will reinitialize your database.  If this is not a new database, hit the Cancel button and contact support at blah@blah.com </div><br><br>


  		




  
  58
  
    
     <div class=warning>Warning: this will reinitialize your database.  If this is not a new database, hit the Cancel button and contact support at <%= supportEmail %>. </div><br><br>


  		




  58
  59
  
    
     The following scripts will be run:


  		




  59
  60
  
    

  		




  60
  61
  
    
        <ul>


  		




  ......




  75
  76
  
    
%>


  		




  76
  77
  
    
     The system has detected the following database version: <%= databaseVersion.getVersionString() %> <br><br>


  		




  77
  78
  
    
     Please hit the Continue button to upgrade your database to version: <%= metacatVersion.getVersionString() %> <br>


  		




  78
  
  
    
    <div class=warning>Warning: this will update your database.  If the detected versions do not seem correct, hit the Cancel button and contact support at blah@blah.com </div><br><br> 


  		




  
  79
  
    
    <div class=warning>Warning: this will update your database.  If the detected versions do not seem correct, hit the Cancel button and contact support at <%= supportEmail %> </div><br><br> 


  		




  79
  80
  
    
     The following scripts will be run:  <br>


  		




  80
  81
  
    
        <ul>


  		




  81
  82
  
    
<%


  		












  

    
      lib/admin/page-message-section.jsp
    
  





  76
  76
  
    
   } else if (request.getAttribute("processingErrors") != null && ((Vector<String>)request.getAttribute("processingErrors")).size() > 0) { 


  		




  77
  77
  
    
%>


  		




  78
  78
  
    
   <div class=error-header>


  		




  79
  
  
    
      The following errors occurred.  Please correct errors if possible or contact your system adminstrator or contact support at blah@blah.com <br><br>


  		




  
  79
  
    
      The following errors occurred.  Please correct errors if possible or contact your system adminstrator or contact support at <%= (String)request.getAttribute("supportEmail") %> <br><br>


  		




  80
  80
  
    
   </div>  


  		




  81
  81
  
    
   <div class=error-text>


  		




  82
  82
  
    
<%     


  		












  

    
      src/edu/ucsb/nceas/metacat/admin/DBAdmin.java
    
  





  173
  173
  
    
				request.setAttribute("databaseVersion", dbVersionString);


  		




  174
  174
  
    
				Vector<String> updateScriptList = getUpdateScripts();


  		




  175
  175
  
    
				request.setAttribute("updateScriptList", updateScriptList);


  		




  
  176
  
    
				String supportEmail = PropertyService.getProperty("email.recipient");


  		




  
  177
  
    
				request.setAttribute("supportEmail", supportEmail);


  		




  176
  178
  
    

  		




  177
  179
  
    
				// Forward the request to the JSP page


  		




  178
  180
  
    
				RequestUtil.clearRequestMessages(request);


  		












Also available in:  Unified diff