Console: Fix /configfamily form (ticket #1797)

This commit is contained in:
zzz
2016-05-29 14:35:39 +00:00
parent 5cb285b034
commit faebe8ab7e
3 changed files with 9 additions and 3 deletions

View File

@ -24,7 +24,7 @@ public class ConfigFamilyHandler extends FormHandler {
@Override
protected void processForm() {
if (_action.equals(_t("Create Router Family"))) {
if (_action.equals(_t("Create New Router Family"))) {
String family = getJettyString("family");
String old = _context.getProperty(FamilyKeyCrypto.PROP_FAMILY_NAME);
if (family == null || family.trim().length() <= 0) {
@ -39,7 +39,7 @@ public class ConfigFamilyHandler extends FormHandler {
} else {
addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs"));
}
} else if (_action.equals(_t("Join Router Family"))) {
} else if (_action.equals(_t("Join Existing Router Family"))) {
InputStream in = _requestWrapper.getInputStream("file");
try {
// non-null but zero bytes if no file entered, don't know why

View File

@ -1,8 +1,14 @@
2016-05-29 zzz
* Console: Fix /configfamily form (ticket #1797)
2016-05-29 str4d
* CertUtil: Dynamically load javax.naming classes to avoid
VerifyErrors on some Androids
* LogWriter: Dynamically load Android writer
2016-05-26 zzz
* Build: Launchpad build fixes
2016-05-25 zzz
* DesktopGui: Add monochrome icons for Windows and Mac
* Reseed:

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 14;
public final static long BUILD = 15;
/** for example "-test" */
public final static String EXTRA = "";