External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 06:26:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2083 from jaredevantabor/awx-net-zoom-default

Browse Source 
Sets default zoom to 100% on network UI
This commit is contained in:
Jared Tabor
2018-06-07 11:42:36 -07:00
committed by GitHub
parent fa9c6967fd 4fa1518bcc
commit 86f840f220
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/network_ui/consumers.py
View File

@@ -241,7 +241,7 @@ def ws_connect(message):
if topology_id is not None: if topology_id is not None:
topology = Topology.objects.get(pk=topology_id) topology = Topology.objects.get(pk=topology_id)
else: else:
topology = Topology(name="topology", scale=1.0, panX=0, panY=0) topology = Topology(name="topology", scale=0.7, panX=0, panY=0)
topology.save() topology.save()
TopologyInventory(inventory_id=inventory_id, topology_id=topology.pk).save() TopologyInventory(inventory_id=inventory_id, topology_id=topology.pk).save()
topology_id = topology.pk topology_id = topology.pk
@@ -322,4 +322,3 @@ def ws_message(message):
def ws_disconnect(message): def ws_disconnect(message):
if 'topology_id' in message.channel_session: if 'topology_id' in message.channel_session:
channels.Group("topology-%s" % message.channel_session['topology_id']).discard(message.reply_channel) channels.Group("topology-%s" % message.channel_session['topology_id']).discard(message.reply_channel)

2
awx/network_ui/tests/functional/test_consumers.py
View File

@@ -196,7 +196,7 @@ def test_ws_connect_new_topology():
mock.patch.object(Inventory, 'objects') as inventory_objects: mock.patch.object(Inventory, 'objects') as inventory_objects:
client_mock.uuid4 = mock.MagicMock(return_value="777") client_mock.uuid4 = mock.MagicMock(return_value="777")
topology_mock.return_value = Topology( topology_mock.return_value = Topology(
name="topology", scale=1.0, panX=0, panY=0, pk=999) name="topology", scale=0.7, panX=0, panY=0, pk=999)
inventory_objects.get.return_value = mock.Mock(admin_role=[mock_user]) inventory_objects.get.return_value = mock.Mock(admin_role=[mock_user])
awx.network_ui.consumers.ws_connect(message) awx.network_ui.consumers.ws_connect(message)
message.reply_channel.send.assert_has_calls([ message.reply_channel.send.assert_has_calls([

2
awx/network_ui/tests/functional/test_models.py
View File

@@ -29,7 +29,7 @@ def test_deletion():
host1 = inv.hosts.create(name='foo') host1 = inv.hosts.create(name='foo')
host2 = inv.hosts.create(name='bar') host2 = inv.hosts.create(name='bar')
topology = Topology.objects.create( topology = Topology.objects.create(
name='inv', scale=1.0, panX=0.0, panY=0.0 name='inv', scale=0.7, panX=0.0, panY=0.0
) )
inv.topologyinventory_set.create(topology=topology) inv.topologyinventory_set.create(topology=topology)
device1 = topology.device_set.create(name='foo', host=host1, x=0.0, y=0.0, cid=1) device1 = topology.device_set.create(name='foo', host=host1, x=0.0, y=0.0, cid=1)

4
awx/ui/client/src/network-ui/hotkeys.fsm.js
View File

@@ -62,7 +62,7 @@ _Enabled.prototype.onKeyDown = function(controller, msg_type, $event) {
} }
if ($event.key === '0') { if ($event.key === '0') {
scope.jump_to_animation(0, 0, 1.0); scope.jump_to_animation(0, 0, 0.7);
} }
controller.delegate_channel.send(msg_type, $event); controller.delegate_channel.send(msg_type, $event);
@@ -83,5 +83,3 @@ _Disabled.prototype.onEnable = function (controller) {
}; };
_Disabled.prototype.onEnable.transitions = ['Enabled']; _Disabled.prototype.onEnable.transitions = ['Enabled'];

2
awx/ui/client/src/network-ui/network.ui.controller.js
View File

@@ -81,7 +81,7 @@ var NetworkUIController = function($scope,
$scope.onMouseLeaveResult = ""; $scope.onMouseLeaveResult = "";
$scope.onMouseMoveResult = ""; $scope.onMouseMoveResult = "";
$scope.onMouseMoveResult = ""; $scope.onMouseMoveResult = "";
$scope.current_scale = 1.0; $scope.current_scale = 0.7;
$scope.current_mode = null; $scope.current_mode = null;
$scope.panX = 0; $scope.panX = 0;
$scope.panY = 0; $scope.panY = 0;