Revision 46777
Added by Panagiotis Kanakakis about 7 years ago
| UserDAO.java | ||
|---|---|---|
| 130 | 130 |
public void saveUser(final User user) {
|
| 131 | 131 |
User u = getUserByEmail(user.getEmail()); |
| 132 | 132 |
if (u != null) {
|
| 133 |
if(u.getPublisher() != null) |
|
| 133 |
if(u.getPublisher() != null && u.getPublisher() == user.getPublisher())
|
|
| 134 | 134 |
user.setPublisher(u.getPublisher()); |
| 135 | 135 |
if(user.getPassword() == null) |
| 136 | 136 |
user.setPassword(u.getPassword()); |
| ... | ... | |
| 141 | 141 |
User user_merged = (User) getSession().merge(user); |
| 142 | 142 |
}else |
| 143 | 143 |
persist(user); |
| 144 |
|
|
| 145 |
|
|
| 146 |
|
|
| 147 |
|
|
| 148 |
|
|
| 144 | 149 |
} |
| 145 | 150 |
|
| 146 | 151 |
//TODO MOVE TO PROJECT DAO |
| ... | ... | |
| 191 | 196 |
|
| 192 | 197 |
public Role getRole(final String roleId) {
|
| 193 | 198 |
Criteria cr = getSession().createCriteria(Role.class); |
| 194 |
cr.add(Restrictions.eq("id", roleId))
|
|
| 195 |
.setResultTransformer( new AliasToBeanResultTransformer(Role.class)); |
|
| 199 |
cr.add(Restrictions.eq("id", roleId));
|
|
| 200 |
// .setResultTransformer( new AliasToBeanResultTransformer(Role.class));
|
|
| 196 | 201 |
return (Role)cr.list().get(0); |
| 197 | 202 |
} |
| 198 | 203 |
|
| ... | ... | |
| 203 | 208 |
} |
| 204 | 209 |
|
| 205 | 210 |
public void acceptUserRole(String email, String roleId) {
|
| 206 |
Criteria cr = getSession().createCriteria(UserRole.class); |
|
| 207 | 211 |
User user = getUserByEmail(email); |
| 208 |
|
|
| 209 | 212 |
for (UserRole ur : user.getRoles()) {
|
| 210 | 213 |
if (ur.getPk().getRole().getId().equals(roleId)) {
|
| 211 | 214 |
ur.setApproved(true); |
| ... | ... | |
| 216 | 219 |
|
| 217 | 220 |
public void rejectUserRole(String email, String roleId) {
|
| 218 | 221 |
User user = getUserByEmail(email); |
| 219 |
for (UserRole ur : user.getRoles()) {
|
|
| 220 |
if (ur.getPk().getRole().getId().equals(roleId)) {
|
|
| 221 |
user.getRoles().remove(ur); |
|
| 222 |
getSession().update(user); |
|
| 223 |
} |
|
| 222 |
UserRole ur = null; |
|
| 223 |
for (UserRole u : user.getRoles()) {
|
|
| 224 |
if (u.getPk().getRole().getId().equals(roleId)) |
|
| 225 |
ur = u; |
|
| 224 | 226 |
} |
| 227 |
user.getRoles().remove(ur); |
|
| 228 |
getSession().update(user); |
|
| 229 |
getSession().delete(ur); |
|
| 225 | 230 |
} |
| 226 | 231 |
|
| 227 | 232 |
|
Also available in: Unified diff