Project

General

Profile

« Previous | Next » 

Revision 46476

View differences:

UserDAO.java
198 198
        User user = (User) createEntityCriteria().add(Restrictions.eq("email", email)).list().get(0);
199 199
        user.setActive(false);
200 200
        log.debug("user is active -> " + user.isActive());
201
        getSession().update(user);
201
        User user_merged = (User) getSession().merge(user);
202 202
        log.debug("user is active -> " + user.isActive());
203 203
    }
204 204

  
205 205
    public void acceptUserRole(String email, String roleId) {
206 206
        Criteria cr = getSession().createCriteria(UserRole.class);
207 207
        User user = getUserByEmail(email);
208
        Role role = getRole(roleId);
209
        UserRole ur = (UserRole) cr.add(Restrictions.eq("pk.user", user))
210
                .add(Restrictions.eq("pk.role", role)).list().get(0);
211 208

  
212
        ur.setApproved(true);
213
        getSession().update(ur);
209
        for (UserRole ur : user.getRoles()) {
210
            if (ur.getPk().getRole().getId() == roleId) {
211
                ur.setApproved(true);
212
                persist(user);
213
            }
214
        }
214 215
    }
215 216

  
216 217
    public void rejectUserRole(String email, String roleId) {
217
        Criteria cr = getSession().createCriteria(UserRole.class);
218 218
        User user = getUserByEmail(email);
219
        Role role = getRole(roleId);
220
        UserRole ur = (UserRole) cr.add(Restrictions.eq("pk.user", user))
221
                .add(Restrictions.eq("pk.role", role)).list().get(0);
222

  
223
        ur.setApproved(false);
224
        user.getRoles().remove(ur);
225
        getSession().update(ur);
226
        getSession().update(user);
219
        for(UserRole ur : user.getRoles()) {
220
            if (ur.getPk().getRole().getId() == roleId) {
221
                ur.setApproved(false);
222
                user.getRoles().remove(ur);
223
            }
224
        }
225
        saveUser(user);
227 226
    }
228 227

  
229 228

  

Also available in: Unified diff