Author: solomax
Date: Mon Jan 23 14:50:48 2017
New Revision: 1779936
URL: http://svn.apache.org/viewvc?rev=1779936&view=rev
Log:
[OPENMEETINGS-1533] external user works as expected as meeting member
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java?rev=1779936&r1=1779935&r2=1779936&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
Mon Jan 23 14:50:48 2017
@@ -50,9 +50,19 @@ public class MeetingMemberDTO implements
if (user.getId() != null) {
mm.setUser(userDao.get(user.getId()));
} else {
- mm.setUser(user.get(userDao));
- mm.getUser().setType(User.Type.contact);
- mm.getUser().getRights().clear();
+ User u = null;
+ if (User.Type.external == user.getType()) {
+ // try to get ext. user
+ u =
userDao.getExternalUser(user.getExternalId(), user.getExternalType());
+ }
+ if (u == null) {
+ u = user.get(userDao);
+ u.setType(User.Type.contact);
+ u.getRights().clear();
+ u.setExternalId(null);
+ u.setExternalType(null);
+ }
+ mm.setUser(u);
}
return mm;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java?rev=1779936&r1=1779935&r2=1779936&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
Mon Jan 23 14:50:48 2017
@@ -50,9 +50,19 @@ public class MeetingMemberDTO implements
if (user.getId() != null) {
mm.setUser(userDao.get(user.getId()));
} else {
- mm.setUser(user.get(userDao));
- mm.getUser().setType(User.Type.contact);
- mm.getUser().getRights().clear();
+ User u = null;
+ if (User.Type.external == user.getType()) {
+ // try to get ext. user
+ u =
userDao.getExternalUser(user.getExternalId(), user.getExternalType());
+ }
+ if (u == null) {
+ u = user.get(userDao);
+ u.setType(User.Type.contact);
+ u.getRights().clear();
+ u.setExternalId(null);
+ u.setExternalType(null);
+ }
+ mm.setUser(u);
}
return mm;
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java?rev=1779936&r1=1779935&r2=1779936&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java
Mon Jan 23 14:50:48 2017
@@ -50,9 +50,19 @@ public class MeetingMemberDTO implements
if (user.getId() != null) {
mm.setUser(userDao.get(user.getId()));
} else {
- mm.setUser(user.get(userDao));
- mm.getUser().setType(User.Type.contact);
- mm.getUser().getRights().clear();
+ User u = null;
+ if (User.Type.external == user.getType()) {
+ // try to get ext. user
+ u =
userDao.getExternalUser(user.getExternalId(), user.getExternalType());
+ }
+ if (u == null) {
+ u = user.get(userDao);
+ u.setType(User.Type.contact);
+ u.getRights().clear();
+ u.setExternalId(null);
+ u.setExternalType(null);
+ }
+ mm.setUser(u);
}
return mm;
}
