Project

General

Profile

Revision 6635

DataONE MN registration/configuration is now its own configuration page in the admin interface.
http://bugzilla.ecoinformatics.org/show_bug.cgi?id=5531

View differences:

metacat-configuration.jsp
37 37
    Boolean authConfigured = (Boolean)request.getAttribute("authConfigured");	
38 38
    Boolean skinsConfigured = (Boolean)request.getAttribute("skinsConfigured");	
39 39
    Boolean dbConfigured = (Boolean)request.getAttribute("dbConfigured");
40
    Boolean replicationConfigured = (Boolean)request.getAttribute("replicationConfigured");
41
    String dataoneConfigured = (String)request.getAttribute("dataoneConfigured");
40 42
    String geoserverConfigured = (String)request.getAttribute("geoserverConfigured");
41 43
    Boolean metacatConfigured = (Boolean)request.getAttribute("metacatConfigured");
42 44
    Boolean metacatServletInitialized = (Boolean)request.getAttribute("metcatServletInitialized");
......
200 202
	}
201 203
%>
202 204

  
205
<%
206

  
207
    if (dataoneConfigured != null && dataoneConfigured.equals(PropertyService.CONFIGURED)) {
208
%>
209
    	<tr>
210
    	<td class="configured-tag">[configured] </td>
211
    	<td class="property-title"> Dataone Configuration </td> 
212
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>   		
213
    	</tr>
214
<%
215
	} else if (dataoneConfigured != null && dataoneConfigured.equals(PropertyService.BYPASSED)){
216
%>    		
217
    	<tr>
218
    	<td class="configured-tag">[bypassed] </td>  
219
		<td class="property-title"> Dataone Configuration </td>  
220
<%
221
		if (propsConfigured != null && propsConfigured) {
222
%>
223
        	
224
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>			       	
225
<%
226
		} else {
227
%> 
228
		<td class="configure-link"> Configure Global Properties First </td>
229
<%
230
		}
231
			%>     	
232
    	</tr>
233
<%
234
	} else {
235
%>    		
236
    	<tr>
237
    	<td class="unconfigured-tag">[unconfigured] </td>  
238
    	<td class="property-title"> Dataone Configuration </td>   
239
<%
240
		if (propsConfigured != null && propsConfigured) {
241
%>
242
        	
243
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Configure Now</a> </td>			
244
        	
245
<%
246
		} else {
247
%> 
248
		<td class="configure-link"> Configure Global Properties First </td>
249
<%
250
		}
251
%>     	
252
    	</tr>
253
<%
254
	}
255
%>
256

  
203 257
</table>
204 258

  
205 259
<%

Also available in: Unified diff