echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Fix NPE on /configsidebar (ticket #2220)

Browse Source 
Don't throw NPE translating null
Add note about split()
Fix form inside table
This commit is contained in:
zzz
2018-04-29 20:57:47 +00:00
parent c73b5b9edb
commit 8ed1b96f3a
6 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java
View File

@ -1006,6 +1006,8 @@ public class SummaryHelper extends HelperBase {
if (config == null)
config = _context.getProperty(PROP_SUMMARYBAR + "default", isAdvanced() ? DEFAULT_FULL_ADVANCED : DEFAULT_FULL);
}
if (config.length() <= 0)
return Collections.emptyList();
return Arrays.asList(DataHelper.split(config, SS));
}
@ -1081,14 +1083,17 @@ public class SummaryHelper extends HelperBase {
.append("</th></tr>\n");
for (String section : sections) {
int i = sections.indexOf(section);
String name = sectionNames.get(section);
if (name == null)
continue;
buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" id=\"")
.append(sectionNames.get(section))
.append(name)
.append("\" name=\"delete_")
.append(i)
.append("\"></td><td align=\"left\"><label for=\"")
.append(sectionNames.get(section))
.append(name)
.append("\">")
.append(_t(sectionNames.get(section)))
.append(_t(name))
.append("</label></td><td align=\"right\"><input type=\"hidden\" name=\"order_")
.append(i).append('_').append(section)
.append("\" value=\"")
@ -1151,8 +1156,11 @@ public class SummaryHelper extends HelperBase {
.append("</option>\n");
for (String s : sortedSections) {
String name = sectionNames.get(s);
if (name == null)
continue;
buf.append("<option value=\"").append(s).append("\">")
.append(sectionNames.get(s)).append("</option>\n");
.append(name).append("</option>\n");
}
buf.append("</select>\n" +