You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/06/19 10:42:58 UTC
svn commit: r1603758 - in /openmeetings:
branches/3.0.x/WebContent/src/base/hibernate/
branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/
trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/
Author: solomax
Date: Thu Jun 19 08:42:57 2014
New Revision: 1603758
URL: http://svn.apache.org/r1603758
Log:
[OPENMEETINGS-1026] Admin ACL is checked to set moderator rights
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Modified: openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1603758&r1=1603757&r2=1603758&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx Thu Jun 19 08:42:57 2014
@@ -813,7 +813,13 @@
if (value.timeZoneId != null) {
canvas.timeZoneId = value.timeZoneId;
}
- canvas.becomemoderator = value.level_id >= 2;
+ if (value.rights != null) {
+ for (var i = 0; i < value.rights.length; ++i) {
+ if ('Admin' == value.rights[i]) {
+ canvas.becomemoderator = true;
+ }
+ }
+ }
if (value.sessionData == null) {
if ($debug) Debug.write("No Language Found to assign");
return;
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1603758&r1=1603757&r2=1603758&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java Thu Jun 19 08:42:57 2014
@@ -272,7 +272,6 @@ public class UserManager implements IUse
* default_domain_id
*
* @param user_level
- * @param level_id
* @param availible
* @param status
* @param login
@@ -347,7 +346,6 @@ public class UserManager implements IUse
/**
* @param user_level
- * @param level_id
* @param availible
* @param status
* @param login
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1603758&r1=1603757&r2=1603758&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Thu Jun 19 08:42:57 2014
@@ -273,7 +273,6 @@ public class UserManager implements IUse
* default_domain_id
*
* @param user_level
- * @param level_id
* @param availible
* @param status
* @param login
@@ -348,7 +347,6 @@ public class UserManager implements IUse
/**
* @param user_level
- * @param level_id
* @param availible
* @param status
* @param login