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

/configclients:

Browse Source 
- Re-enable plugin installation by default
 - Don't show configuration section or update-all button if no plugins installed
This commit is contained in:
zzz
2014-08-30 16:14:41 +00:00
parent 2302aee819
commit 8a7c3390f5
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
View File

@@ -59,7 +59,7 @@ public class ConfigClientsHandler extends FormHandler {
}
if (_action.equals(_("Install Plugin"))) {
if (pluginsEnabled &&
(_context.getBooleanProperty(ConfigClientsHelper.PROP_ENABLE_PLUGIN_INSTALL) ||
(_context.getBooleanPropertyDefaultTrue(ConfigClientsHelper.PROP_ENABLE_PLUGIN_INSTALL) ||
isAdvanced()))
installPlugin();
else

7
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
View File

@@ -39,7 +39,12 @@ public class ConfigClientsHelper extends HelperBase {
/** @since 0.9.14.1 */
public boolean isPluginInstallEnabled() {
return PluginStarter.pluginsEnabled(_context) &&
(_context.getBooleanProperty(PROP_ENABLE_PLUGIN_INSTALL) || isAdvanced());
(_context.getBooleanPropertyDefaultTrue(PROP_ENABLE_PLUGIN_INSTALL) || isAdvanced());
}
/** @since 0.9.15 */
public boolean isPluginUpdateEnabled() {
return !PluginStarter.getPlugins().isEmpty();
}
/** @since 0.8.3 */