Skip to content

Commit a854520

Browse files
committed
CLDR-19114 JspCoreException, revision
-Revise st_top.jsp and usermenu.jsp to restore some functionality, if the code is not dead
1 parent aa0810c commit a854520

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ public static boolean isCoverageOrganization(String org) {
868868
.contains(org.toLowerCase()));
869869
}
870870

871-
// WARNING: this is accessed by possibleProblems.jsp
871+
// WARNING: this is accessed by possibleProblems.jsp and usermenu.jsp
872872
public String getEffectiveCoverageLevel() {
873873
return getEffectiveCoverageLevel(getLocale().toString());
874874
}

tools/cldr-apps/src/main/webapp/WEB-INF/tmpl/st_top.jsp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ if(ctx!=null) {
2525
%>
2626
<div id="toparea">
2727
<img id="stlogo" width="44" height="48" src='<%= WebContext.context(request, "STLogo"+".png") %>' title="[ST Logo]" alt="[ST Logo]" />
28-
<!-- A non-existent function ctx.sm.phase() was called here. It has been replaced by "unknown". -->
29-
<div id="toptitle" title='Phase: unknown'>
28+
<div id="toptitle" title='Phase: <%= ctx.sm.getOverallSurveyPhase().toString() %>'>
3029
<span class='title-cldr'>CLDR <%= ctx.sm.getNewVersion() %> Survey Tool
3130
: </span>
3231

tools/cldr-apps/src/main/webapp/WEB-INF/tmpl/usermenu.jsp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ String helpName = ctx.getString("helpName");
1717
%><%@ include file="/WEB-INF/tmpl/small_login.jsp" %><%
1818
ctx.println("</form>");
1919
20-
// A non-existent function ctx.getCoverageSetting was called here. It has been replaced by null.
21-
String curSetting = null;
20+
String curSetting = ctx.getEffectiveCoverageLevel();
2221
if(curSetting!=null && !curSetting.equals(WebContext.COVLEV_RECOMMENDED)) {
2322
ctx.println("<span style='border: 2px solid blue'>");
2423
}

0 commit comments

Comments
 (0)