Author: solomax
Date: Thu Sep 1 16:50:33 2016
New Revision: 1758810
URL: http://svn.apache.org/viewvc?rev=1758810&view=rev
Log:
[OPENMEETINGS-1455] recordings are downloaded as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1758810&r1=1758809&r2=1758810&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Thu Sep 1 16:50:33 2016
@@ -357,7 +357,8 @@ public class MainService implements IPen
public Long loginUserByRemote(String SID) {
try {
Long users_id = sessiondataDao.check(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ Set<Right> _rights = userDao.getRights(users_id);
+ if (AuthLevelUtil.hasAdminLevel(_rights) ||
AuthLevelUtil.hasWebServiceLevel(_rights)) {
Sessiondata sd = sessiondataDao.get(SID);
if (sd == null || sd.getXml() == null) {
return -37L;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java?rev=1758810&r1=1758809&r2=1758810&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
Thu Sep 1 16:50:33 2016
@@ -63,7 +63,11 @@ public abstract class RecordingResourceR
} catch (Exception e) {
//no-op expected
}
- if (id != null && WebSession.get().isSignedIn()) {
+ WebSession ws = WebSession.get();
+ if (id == null && ws.signIn(_id.toString(), true)) {
+ id = getRecordingId();
+ }
+ if (id != null && ws.isSignedIn()) {
return getRecording(id);
}
return null;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java?rev=1758810&r1=1758809&r2=1758810&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
Thu Sep 1 16:50:33 2016
@@ -63,7 +63,11 @@ public abstract class RecordingResourceR
} catch (Exception e) {
//no-op expected
}
- if (id != null && WebSession.get().isSignedIn()) {
+ WebSession ws = WebSession.get();
+ if (id == null && ws.signIn(_id.toString(), true)) {
+ id = getRecordingId();
+ }
+ if (id != null && ws.isSignedIn()) {
return getRecording(id);
}
return null;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java?rev=1758810&r1=1758809&r2=1758810&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
Thu Sep 1 16:50:33 2016
@@ -63,7 +63,11 @@ public abstract class RecordingResourceR
} catch (Exception e) {
//no-op expected
}
- if (id != null && WebSession.get().isSignedIn()) {
+ WebSession ws = WebSession.get();
+ if (id == null && ws.signIn(_id.toString(), true)) {
+ id = getRecordingId();
+ }
+ if (id != null && ws.isSignedIn()) {
return getRecording(id);
}
return null;
