Project

General

Profile

« Previous | Next » 

Revision 4751

Added by daigle almost 16 years ago

Process affiliated ldap info

View differences:

src/edu/ucsb/nceas/metacat/admin/AuthAdmin.java
105 105
				for (String name : propertyNames) {
106 106
					request.setAttribute(name, PropertyService.getProperty(name));
107 107
				} 
108
				
109
				// add the list of organization options and their values to the request.  This is because
110
				// currently we use the organization.unaffiliated values to configure metacat client for 
111
				// password change and account creation.  Eventually, these should get moved to organization
112
				// level configuration.
113
				Vector<String> orgPropertyNames = PropertyService.getPropertyNamesByGroup("organization");
114
				for (String name : orgPropertyNames) {
115
					request.setAttribute(name, PropertyService.getProperty(name));
116
				} 
108 117

  
109 118
				// Check for any backup properties and apply them to the request.
110 119
				// These are properties from previous configurations. They keep
......
156 165
					PropertyService.checkAndSetProperty(request,
157 166
							globalPropertyKey);
158 167
				}
168
				
169
				// process the fields for the global options (group 1)
170
				SortedMap<Integer, MetaDataProperty> authClientPropertyMap = authMetaData
171
						.getPropertiesInGroup(2);
172
				Set<Integer> authClientPropertyIndexes = authClientPropertyMap.keySet();
173
				for (Integer authClientPropertyIndex : authClientPropertyIndexes) {
174
					String authClientPropertyKey = authClientPropertyMap.get(
175
							authClientPropertyIndex).getKey();
176
					PropertyService.checkAndSetProperty(request,
177
							authClientPropertyKey);
178
				}
159 179

  
160 180
				// we need to write the options from memory to the properties
161 181
				// file

Also available in: Unified diff