Project

General

Profile

« Previous | Next » 

Revision 45438

View differences:

UserDAO.java
133 133
		for(UserRole ur : user.getRoles()){
134 134
			Role r = ur.getPk().getRole();
135 135
			getSession().persist(r);
136

  
137 136
		}
138 137
		persist(user);
139 138
	}
140 139

  
141
	/*public void deleteAffiliations(final String email) {
142
		Criteria cr = getSession().createCriteria(Affiliation.class);
143
		Affiliation af = (Affiliation) cr.add(Restrictions.eq("email",email)).list().get(0);
144
		getSession().delete(af);
145
	}*/
146

  
147
	/*public void deletePersonRoles(final String email) {
148
		Criteria cr = getSession().createCriteria(Affiliation.class);
149
		UserRole ur = (UserRole) cr.add(Restrictions.eq("email",email)).list().get(0);
150
		getSession().delete(ur);
151
	}*/
152

  
153 140
	//TODO MOVE TO PROJECT DAO
154 141
	/*public void removeProjectCoordinators(final String email) {
155 142
		Criteria cr = getSession().createCriteria(ProjectCoordinator.class);
......
163 150
		persist(user);
164 151
	}*/
165 152

  
166
	/*public void saveUserRoles(final String email, final List<Role> roles) {
167
		User user = getUserByEmail(email);
168
		user.setRole(roles);
169
		persist(user);
170
	}*/
171
/*
172 153

  
173
	public void saveAffiliations(final User user, final List<Affiliation> affiliations) {
154

  
155
	/*public void saveAffiliations(final User user, final List<Affiliation> affiliations) {
174 156
		user.setAffiliations(affiliations);
175 157
		persist(user);
176 158
	}*/
......
181 163

  
182 164
		Criteria cr = getSession().createCriteria(Role.class);
183 165
		Role role = (Role) cr.add(Restrictions.eq("id",role_id)).list().get(0);
184

  
185 166
		cr = getSession().createCriteria(UserRole.class);
186 167

  
187 168
		List<UserRole> rs = cr.add(Restrictions.eq("approved", true))
188 169
				.add(Restrictions.eq("pk.role", role)).list();
170

  
171

  
189 172
		List<User> users = new ArrayList<>();
190
		for(int i=0;i<users.size();i++)
191
			users.add(rs.get(i).getPk().getUser());
173
		for(UserRole ur : rs)
174
			users.add(ur.getPk().getUser());
192 175
		return users;
193 176
	}
194 177
	
......
212 195
		getSession().update(user);
213 196
	}
214 197

  
215
	public void acceptUserRole(String email, String role_id) {
198
	public void acceptUserRole(String email, String roleId) {
199
		changeRoleApprovedStatus(email,roleId,true);
200
	}
201

  
202
	public void rejectUserRole(String email, String roleId) {
203
		changeRoleApprovedStatus(email,roleId,false);
204
	}
205

  
206
	public void changeRoleApprovedStatus(String email,String roleId,boolean status){
216 207
		Criteria cr = getSession().createCriteria(UserRole.class);
217 208
		User user = getUserByEmail(email);
218
		Role role = getRole(role_id);
209
		Role role = getRole(roleId);
219 210
		UserRole ur = (UserRole) cr.add(Restrictions.eq("pk.user", user))
220 211
				.add(Restrictions.eq("pk.role", role)).list().get(0);
221 212

  
222
		ur.setApproved(true);
213
		ur.setApproved(status);
223 214
		getSession().update(ur);
224 215
	}
225 216

  
226
	public void rejectUserRole(String email, String roleId) {
227
		Criteria cr = getSession().createCriteria(UserRole.class);
228
		UserRole ur = (UserRole) cr.add(Restrictions.eq("pk.email", email))
229
				.add(Restrictions.eq("pk.role_id", roleId)).list().get(0);
230
		getSession().delete(ur);
231
	}
232

  
233 217
	@SuppressWarnings("unchecked")
234 218
	public List<User> getUsers() {
235 219
		return createEntityCriteria().list();

Also available in: Unified diff