Author: solomax
Date: Sat Jun 14 08:51:58 2014
New Revision: 1602571
URL: http://svn.apache.org/r1602571
Log:
ACLs are working as expected with Moodle
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1602571&r1=1602570&r2=1602571&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Sat Jun 14 08:51:58 2014
@@ -348,7 +348,10 @@ public class MainService implements IPen
Address a =
userDao.getAddress(null, null, null, 1L, null, null, null,
userObject.getEmail());
- User u =
userDao.addUser(UserDao.getDefaultRights(), userObject.getFirstname(),
userObject.getUsername(),
+ Set<Right> rights =
UserDao.getDefaultRights();
+
rights.remove(Right.Login);
+
rights.remove(Right.Dashboard);
+ User u =
userDao.addUser(rights, userObject.getFirstname(), userObject.getUsername(),
userObject.getLastname(), 1L, "" // password is empty by default
, a, false, null, null, timezoneUtil.getTimeZone(iCalTz), false
, null, null, false, false, userObject.getExternalUserId()
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1602571&r1=1602570&r2=1602571&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Sat Jun 14 08:51:58 2014
@@ -534,10 +534,15 @@ public class UserDao implements IDataPro
}
public User getExternalUser(String extId, String extType) {
- return em.createNamedQuery("getExternalUser", User.class)
+ User u = null;
+ try {
+ u = em.createNamedQuery("getExternalUser", User.class)
.setParameter("externalId", extId)
.setParameter("externalType", extType)
.getSingleResult();
+ } catch (NoResultException ex) {
+ }
+ return u;
}
public List<User> get(String search, int start, int count, String
order) {
@@ -644,7 +649,9 @@ public class UserDao implements IDataPro
// this is needed cause the language is not a needed data at
registering
u.setLanguage_id(language_id != 0 ? language_id : null);
- u.updatePassword(cfgDao, userpass);
+ if (!Strings.isEmpty(userpass)) {
+ u.updatePassword(cfgDao, userpass);
+ }
u.setRegdate(new Date());
u.setDeleted(false);
u.setPictureuri(pictureuri);
