Merge remote-tracking branch 'origin/OpenOLAT_12.5'

src/main/java/org/olat/admin/UserAdminMainController.java

+/**
+* OLAT - Online Learning and Training<br>
+* http://www.olat.org
+* <p>
+* Licensed under the Apache License, Version 2.0 (the "License"); <br>
+* you may not use this file except in compliance with the License.<br>
+* You may obtain a copy of the License at
+* <p>
+* http://www.apache.org/licenses/LICENSE-2.0
+* <p>
+* Unless required by applicable law or agreed to in writing,<br>
+* software distributed under the License is distributed on an "AS IS" BASIS, <br>
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+* See the License for the specific language governing permissions and <br>
+* limitations under the License.
+* <p>
+* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
+* University of Zurich, Switzerland.
+* <hr>
+* <a href="http://www.openolat.org">
+* OpenOLAT - Online Learning and Training</a><br>
+* This file has been modified by the OpenOLAT community. Changes are licensed
+* under the Apache 2.0 license as the original file.
+*/
+
+package org.olat.admin;
+
+/**
+ * 
+ */
+public class UserAdminMainController  {
+	
+}

src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java

@@ -140,10 +140,6 @@ public class BCCourseNodeEditController extends ActivateableTabbableDefaultContr
 		vfButton = LinkFactory.createButton("folder.view", folderContent, this);
 	}
 
-	/**
-	 * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.components.Component, org.olat.core.gui.control.Event)
-	 */
 	@Override
 	public void event(UserRequest ureq, Component source, Event event) {
 		if (source == vfButton){
@@ -183,11 +179,15 @@ public class BCCourseNodeEditController extends ActivateableTabbableDefaultContr
 			}
 		}
 		
-		folderCtrl = new FolderRunController(namedContainer, false, ureq, getWindowControl());
-		listenTo(folderCtrl);
-		cmc = new CloseableModalController(getWindowControl(), translate("close"), folderCtrl.getInitialComponent());
-		listenTo(cmc);
-		cmc.activate();
+		if(namedContainer == null) {
+			showWarning("warning.no.linkedfolder");
+		} else {
+			folderCtrl = new FolderRunController(namedContainer, false, ureq, getWindowControl());
+			listenTo(folderCtrl);
+			cmc = new CloseableModalController(getWindowControl(), translate("close"), folderCtrl.getInitialComponent());
+			listenTo(cmc);
+			cmc.activate();
+		}
 	}
 	
 	private VFSSecurityCallback getSecurityCallbackWithQuota(String relPath) {

src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties

@@ -177,7 +177,7 @@ export.page=Export page
 export.page.onepage=In a single page
 export.page.pdf=Export page as PDF
 fileupload=Teaser Image
-filter.sections.empty=No open sections
+filter.sections.open=Open sections
 filter.show.all=Show all
 firstName=First name
 go.to.trash=Go to trash

src/main/java/org/olat/modules/portfolio/ui/shared/SharedBindersController.java

@@ -185,7 +185,7 @@ public class SharedBindersController extends FormBasicController implements Acti
 		tableEl.setSortSettings(options);
 
 		List<FlexiTableFilter> tableFilters = new ArrayList<>();
-		tableFilters.add(new FlexiTableFilter(translate("filter.sections.empty"), SharedBindersDataModel.EMPTY_SECTIONS, "o_icon o_empty_sections"));
+		tableFilters.add(new FlexiTableFilter(translate("filter.sections.open"), SharedBindersDataModel.EMPTY_SECTIONS, "o_icon o_sections_open"));
 		tableFilters.add(FlexiTableFilter.SPACER);
 		tableFilters.add(new FlexiTableFilter(translate("filter.show.all"), "all", true));
 		tableEl.setFilters("Filters", tableFilters, false);