Project

General

Profile

Revision 4159

Added by daigle over 12 years ago

Add support for separate LDAP and organization level configurations

View differences:

admin-login.jsp
1 1
<%@ page language="java" %> 
2
<%@ page import="java.util.Vector,edu.ucsb.nceas.metacat.util.LDAPUtil,edu.ucsb.nceas.metacat.service.PropertyService" %>
2
<%@ page import="edu.ucsb.nceas.metacat.util.OrganizationUtil,edu.ucsb.nceas.metacat.service.PropertyService" %>
3 3
<% 
4 4
/**
5 5
 *  '$RCSfile$'
......
28 28
%>
29 29

  
30 30
<% 
31
	Vector<String> organizationList = LDAPUtil.getOrganizations();
31
	Vector<String> organizationList = OrganizationUtil.getOrganizations();
32 32
%>
33 33

  
34 34
<html>
......
85 85
%>
86 86
			<option value="<%= orgName %>"
87 87
<%
88
			if (PropertyService.getProperty("ldap.base." + orgName) == null || PropertyService.getProperty("ldap.base." + orgName).equals("")) {
88
			if (PropertyService.getProperty("organization.base." + orgName) == null || PropertyService.getProperty("organization.base." + orgName).equals("")) {
89 89
%>
90 90
			disabled="disabled"
91 91
<%

Also available in: Unified diff