OLAT-6177

description and courseTitle are now correctly fetched from the imported course (zipfile->configuration). Thus the description field is correctly pre-filled with the description from the imported course.

FXOLAT-193

--HG--
branch : uzhFixes711

olat3/webapp/WEB-INF/src/org/olat/course/repository/ImportCourseController.java

@@ -22,6 +22,7 @@
 package org.olat.course.repository;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -228,9 +229,16 @@ public class ImportCourseController extends BasicController implements IAddContr
 				return;
 			}
 			callback.setResourceable(newCourseResource);
-			 // Set title of root node. do not call course.getTitle() at this point.
-			callback.setDisplayName(course.getEditorTreeModel().getRootNode().getTitle());
 			callback.setResourceName(fCourseImportZIP.getName());
+			
+			final File exportDir = new File(course.getCourseBaseContainer().getBasefile(),"/exportd/");
+			if(exportDir.exists() && exportDir.canRead()){
+				final RepositoryEntryImportExport importExport = new RepositoryEntryImportExport(exportDir);
+				callback.setDisplayName(importExport.getDisplayName());
+				callback.setDescription(importExport.getDescription());
+			}else{
+				logError("Directory "+exportDir.getAbsolutePath()+" not found", new FileNotFoundException());
+			}
 			// collect all nodes
 			collectNodesAsList((CourseEditorTreeNode)course.getEditorTreeModel().getRootNode(), nodeList);
 			nodeListPos = 0;

olat3/webapp/WEB-INF/src/org/olat/repository/controllers/RepositoryAddCallback.java

@@ -40,7 +40,8 @@ public class RepositoryAddCallback {
 	private OLATResourceable resourceable;
 	private String resourceName;
 	private String displayName;
-	
+	private String description;
+
 	protected RepositoryAddCallback() {
 		// only allow to be instantiated without addController by repository itself.
 	}
@@ -93,6 +94,21 @@ public class RepositoryAddCallback {
 		this.displayName = displayName;
 	}
 	
+	
+	/**
+	 * 
+	 * @param description
+	 */
+	public void setDescription(final String description){
+		this.description = description;
+	}
+	
+	
+	protected String getDescription() {
+		return description;
+	}
+	
+	
 	/**
 	 * Call finished() upon success. Must have set all data before calling finished.
 	 * This will return to the calling controller.

olat3/webapp/WEB-INF/src/org/olat/repository/controllers/RepositoryAddController.java

@@ -365,6 +365,13 @@ public class RepositoryAddController extends BasicController {
 		String resName = addCallback.getResourceName();
 		if (resName == null) resName = "";
 		addedEntry.setResourcename(resName);
+		
+		String resDescription = addCallback.getDescription();
+		if(resDescription == null){
+			resDescription = "";
+		}
+		addedEntry.setDescription(resDescription);
+		
     // Do set access for owner at the end, because unfinished course should be invisible
 		// addedEntry.setAccess(RepositoryEntry.ACC_OWNERS);
 		addedEntry.setAccess(0);//Access for nobody