Merge branch 'OpenOLAT_15.2'

src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java

@@ -37,8 +37,11 @@ import org.olat.core.util.StringHelper;
 import org.olat.course.editor.NodeEditController;
 import org.olat.course.nodes.OpencastCourseNode;
 import org.olat.modules.ModuleConfiguration;
+import org.olat.modules.opencast.AuthDelegate;
 import org.olat.modules.opencast.OpencastEventProvider;
 import org.olat.modules.opencast.OpencastSeriesProvider;
+import org.olat.modules.opencast.OpencastService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -63,6 +66,9 @@ public class OpencastConfigController extends FormBasicController {
 	
 	private final ModuleConfiguration config;
 	
+	@Autowired
+	private OpencastService opncastService;
+	
 	public OpencastConfigController(UserRequest ureq, WindowControl wControl, OpencastCourseNode courseNode) {
 		super(ureq, wControl);
 		config = courseNode.getModuleConfiguration();
@@ -73,6 +79,8 @@ public class OpencastConfigController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		setFormTranslatedDescription(getFormDescription());
+		
 		displayEl = uifactory.addRadiosVertical("config.display", formLayout, DISPLAY_KEYS, translateAll(getTranslator(), DISPLAY_KEYS));
 		displayEl.addActionListener(FormEvent.ONCHANGE);
 		String selectedKey = config.has(OpencastCourseNode.CONFIG_EVENT_IDENTIFIER)? DISPLAY_KEY_EVENT: DISPLAY_KEY_SERIES;
@@ -110,6 +118,18 @@ public class OpencastConfigController extends FormBasicController {
 		formLayout.add(buttonsCont);
 		uifactory.addFormSubmitButton("save", buttonsCont);
 	}
+
+	private String getFormDescription() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(translate("config.desc.select"));
+		AuthDelegate authDelegate = opncastService.getAuthDelegate(getIdentity());
+		if (AuthDelegate.Type.User == authDelegate.getType()) {
+			sb.append(" ").append(translate("config.desc.user", new String[] {authDelegate.getValue()}));
+		} else if (AuthDelegate.Type.Roles == authDelegate.getType()) {
+			sb.append(" ").append(translate("config.desc.roles", new String[] {authDelegate.getValue()}));
+		}
+		return sb.toString();
+	}
 	
 	private void updateUI() {
 		boolean seriesSelected = displayEl.isOneSelected() && displayEl.getSelectedKey().equals(DISPLAY_KEY_SERIES);

src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_de.properties

+config.desc.roles=Sie erhalten alle Serien/Videos der Rollen '{0}'.
+config.desc.select=W\u00e4hlen Sie eine Serie oder ein Video aus, indem sie im Feld unten nach seinem Titel suchen.
+config.desc.user=Sie erhalten alle Serien/Videos f\u00fcr den Benutzer '{0}'.
 config.display=Anzeige
 config.display.event=Video
 config.display.series=Serie

src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_en.properties

+config.desc.roles=You will get all series/videos of roles '{0}'.
+config.desc.select=Select a series or a video by searching for its title in the field below.
+config.desc.user=You will get all series/videos of user '{0}'.
 config.display=Display
 config.display.event=Video
 config.display.series=Series

src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonOpenCastRecordingsHandler.java

@@ -151,7 +151,7 @@ public class BigBlueButtonOpenCastRecordingsHandler implements BigBlueButtonReco
 			}
 			if(StringHelper.containsNonWhitespace(username)) {
 				uriBuilder.optionalParameter("meta_opencast-dc-rightsHolder", username);
-				uriBuilder.optionalParameter("meta_opencast-acl-read-roles", "ROLE_OAUTH_USER ROLE_USER_" + username.toUpperCase());
+				uriBuilder.optionalParameter("meta_opencast-acl-read-roles", "ROLE_USER_" + username.toUpperCase());
 				uriBuilder.optionalParameter("meta_opencast-acl-write-roles", "ROLE_USER_" + username.toUpperCase());
 			}
 		}
@@ -187,7 +187,7 @@ public class BigBlueButtonOpenCastRecordingsHandler implements BigBlueButtonReco
 		}
 
 		// Location of the event
-		uriBuilder.optionalParameter("meta_opencast-dc-spatial", "Olat-BigBlueButton");
+		uriBuilder.optionalParameter("meta_opencast-dc-spatial", "OpenOlat-BigBlueButton");
 		// Date of the event
 		uriBuilder.optionalParameter("meta_opencast-dc-created", Formatter.formatDatetime(meetingCreation));