OO-623: fix some issues with display of lifecycle in details, fix wrong...

OO-623: fix some issues with display of lifecycle in details, fix wrong display in the select box in edit properties of course

src/main/java/org/olat/repository/_content/details.html

@@ -20,6 +20,7 @@ $r.render("backLink")
 	</div>
 #end
 
+#if($showLf)
 <fieldset class="b_clearfix">
 	<legend>$r.translate("cif.dates")</legend>
 	#if($lfStart || $lfEnd)
@@ -39,6 +40,7 @@ $r.render("backLink")
 		<p>$r.translate("no.lifecycle")</p>
 	#end
 </fieldset>
+#end
 
 <fieldset class="b_clearfix">
 	<legend>$r.translate("details.description")</legend>

src/main/java/org/olat/repository/controllers/RepositoryDetailsController.java

@@ -268,6 +268,14 @@ public class RepositoryDetailsController extends BasicController implements Gene
 		downloadButton.setEnabled(repositoryEntry.getCanDownload());
 		downloadButton.setTextReasonForDisabling(translate("disabledexportreason"));
 		
+		//reset cycle datas
+		main.contextPut("lfStart", null);
+		main.contextPut("lfEnd", null);
+		main.contextPut("lfLabel", null);
+		main.contextPut("lfSoftKey", null);
+		main.contextPut("showLf", Boolean.FALSE);
+		
+		//fill cycle datas if needed
 		RepositoryEntryLifecycle cycle = repositoryEntry.getLifecycle();
 		if(cycle != null) {
 			Formatter format = Formatter.getInstance(getLocale());
@@ -278,10 +286,10 @@ public class RepositoryDetailsController extends BasicController implements Gene
 				String softKey = cycle.getSoftKey();
 				main.contextPut("lfLabel", label);
 				main.contextPut("lfSoftKey", softKey);
-			} else {
-				main.contextPut("lfLabel", null);
-				main.contextPut("lfSoftKey", null);
 			}
+			main.contextPut("showLf", Boolean.TRUE);
+		} else if("CourseModule".equals(repositoryEntry.getOlatResource().getResourceableTypeName())) {
+			main.contextPut("showLf", Boolean.TRUE);
 		}
 		
 		if (repositoryEntry.getDescription() != null) {
@@ -360,6 +368,7 @@ public class RepositoryDetailsController extends BasicController implements Gene
 			typeDisplayText.append(translate("cif.type.na"));
 		}
 		main.contextPut("type", typeDisplayText.toString());
+
 		VelocityContainer infopanelVC = createVelocityContainer("infopanel");
 		// show how many users are currently using this resource
 		String numUsers;

src/main/java/org/olat/repository/controllers/RepositoryEditDescriptionController.java

@@ -194,7 +194,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
 			int count = 0;	
 			for(RepositoryEntryLifecycle cycle:cycles) {
 				publicKeys[count] = cycle.getKey().toString();
-				publicValues[count] = cycle.getLabel();
+				publicValues[count++] = cycle.getLabel();
 			}
 			publicDatesEl = uifactory.addDropdownSingleselect("cif.public.dates", descCont, publicKeys, publicValues, null);