From 24b0ff86a277ec50a8b004e68ac53120f13b445d Mon Sep 17 00:00:00 2001
From: strentini <none@none>
Date: Tue, 24 Jan 2012 16:56:49 +0100
Subject: [PATCH] non-jira: fix LDAP-login screen icon bug, fix npe in
nodeEvaluation
---
.../java/org/olat/course/run/userview/NodeEvaluation.java | 6 ++++--
.../java/org/olat/ldap/ui/LDAPAuthenticationController.java | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/course/run/userview/NodeEvaluation.java b/src/main/java/org/olat/course/run/userview/NodeEvaluation.java
index 0699ebdc617..76835b75394 100644
--- a/src/main/java/org/olat/course/run/userview/NodeEvaluation.java
+++ b/src/main/java/org/olat/course/run/userview/NodeEvaluation.java
@@ -117,8 +117,10 @@ public class NodeEvaluation extends GenericNode {
gtn.setAltText(courseNode.getLongTitle());
String type = courseNode.getType();
CourseNodeConfiguration cnConfig = CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(type);
- String nodeCssClass = cnConfig.getIconCSSClass();
- gtn.setIconCssClass(nodeCssClass);
+ if(cnConfig != null) {
+ String nodeCssClass = cnConfig.getIconCSSClass();
+ gtn.setIconCssClass(nodeCssClass);
+ }
gtn.setUserObject(this); // the current NodeEval is set into the treenode
// as the userobject
// all treenodes added here are set to be visible/accessible, since the
diff --git a/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java b/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
index 020ab7e535b..34cdb959486 100644
--- a/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
+++ b/src/main/java/org/olat/ldap/ui/LDAPAuthenticationController.java
@@ -87,11 +87,11 @@ public class LDAPAuthenticationController extends AuthenticationController imple
if(UserModule.isPwdchangeallowed(null) && LDAPLoginModule.isPropagatePasswordChangedOnLdapServer()) {
pwLink = LinkFactory.createLink("_olat_login_change_pwd", "menu.pw", loginComp, this);
- pwLink.setCustomEnabledLinkCSS("o_login_pwd");
+ pwLink.setCustomEnabledLinkCSS("o_login_pwd b_with_small_icon_left");
}
if (LoginModule.isGuestLoginLinksEnabled()) {
anoLink = LinkFactory.createLink("_olat_login_guest", "menu.guest", loginComp, this);
- anoLink.setCustomEnabledLinkCSS("o_login_guests");
+ anoLink.setCustomEnabledLinkCSS("o_login_guests b_with_small_icon_left");
}
// Use the standard OLAT login form but with our LDAP translator
--
GitLab