diff options
| -rw-r--r-- | CHANGELOG.txt | 4 | ||||
| -rw-r--r-- | endpoints/lib/vboxconnector.php | 9 | ||||
| -rw-r--r-- | panes/settingsGlobalNetwork.html | 5 |
3 files changed, 7 insertions, 11 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ed431cc..2e26267 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,10 @@ -------------------------------------
Translation fixes
+Fixed error when creating host-only networks
+
+Fixed host-only network DHCP server settings
+
-------------------------------------
5.0-1 2015-08-05
-------------------------------------
diff --git a/endpoints/lib/vboxconnector.php b/endpoints/lib/vboxconnector.php index 071aaf1..c1d6cd7 100644 --- a/endpoints/lib/vboxconnector.php +++ b/endpoints/lib/vboxconnector.php @@ -2356,7 +2356,6 @@ class vboxconnector { // progress operation result $response = array(); - $success = 1; $error = 0; // Connect to vboxwebsrv @@ -2378,7 +2377,6 @@ class vboxconnector { } catch (Exception $e) { $this->errors[] = $e; throw new Exception('Could not obtain progress operation: '.$args['progress']); - $success = 0; } $response['progress'] = $args['progress']; @@ -2424,16 +2422,9 @@ class vboxconnector { } } catch (Exception $null) {} - // Some progress operations seem to go away after completion - if(!($this->session->handle && (string)$this->session->state == 'Unlocked')) { - $this->errors[] = $e; - $success = 0; - } - } if($error) { - $success = 0; if(@$args['catcherrs']) $response['error'] = $error; else $this->errors[] = new Exception($error['message']); diff --git a/panes/settingsGlobalNetwork.html b/panes/settingsGlobalNetwork.html index 768c1f7..0fe0b56 100644 --- a/panes/settingsGlobalNetwork.html +++ b/panes/settingsGlobalNetwork.html @@ -481,11 +481,12 @@ function vboxSettingsGlobalNetEditDialog() { $('#vboxSettingsGlobalNetEdit').tabs('option','active',0);
+ $('#vboxSettingsGlobalNetDHCPEnabled').trigger('click');
if(nic.dhcpServer && nic.dhcpServer.enabled && !$('#vboxSettingsGlobalNetDHCPEnabled').prop('checked')) {
- $('#vboxSettingsGlobalNetDHCPEnabled').prop('checked', true).trigger('click');
+ $('#vboxSettingsGlobalNetDHCPEnabled').trigger('click');
} else if(nic.dhcpServer && !nic.dhcpServer.enabled && $('#vboxSettingsGlobalNetDHCPEnabled').prop('checked')) {
- $('#vboxSettingsGlobalNetDHCPEnabled').prop('checked', false).trigger('click');
+ $('#vboxSettingsGlobalNetDHCPEnabled').trigger('click');
}
$('#vboxSettingsGlobalNetEditDialog').dialog('open');
|