Merge 97e5323 into 5d88f76

yast · Apr 8, 2019 · 3b9ec2e · 3b9ec2e
2 parents 5d88f76 + 97e5323
commit 3b9ec2e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/src/lib/y2network/widgets/ip4_forwarding.rb b/src/lib/y2network/widgets/ip4_forwarding.rb
@@ -1,4 +1,5 @@
 require "cwm/common_widgets"
+Yast.import "NetworkService"
 
 module Y2Network
   module Widgets
@@ -11,6 +12,7 @@ def initialize(config)
 
       def init
         self.value = @config.routing.forward_ipv4
+        disable if Yast::NetworkService.network_manager?
       end
 
       def store

diff --git a/src/lib/y2network/widgets/ip6_forwarding.rb b/src/lib/y2network/widgets/ip6_forwarding.rb
@@ -1,4 +1,5 @@
 require "cwm/common_widgets"
+Yast.import "NetworkService"
 
 module Y2Network
   module Widgets
@@ -11,6 +12,7 @@ def initialize(config)
 
       def init
         self.value = @config.routing.forward_ipv6
+        disable if Yast::NetworkService.network_manager?
       end
 
       def store

diff --git a/src/lib/y2network/widgets/routing_buttons.rb b/src/lib/y2network/widgets/routing_buttons.rb
@@ -2,7 +2,7 @@
 require "y2network/dialogs/route"
 require "y2network/route"
 
-Yast.import "Routing"
+Yast.import "NetworkService"
 
 module Y2Network
   module Widgets
@@ -24,6 +24,10 @@ def handle
 
         nil
       end
+
+      def init
+        disable if Yast::NetworkService.network_manager?
+      end
     end
 
     class EditRoute < CWM::PushButton
@@ -46,6 +50,10 @@ def handle
 
         nil
       end
+
+      def init
+        disable if Yast::NetworkService.network_manager?
+      end
     end
 
     class DeleteRoute < CWM::PushButton
@@ -65,6 +73,10 @@ def handle
 
         nil
       end
+
+      def init
+        disable if Yast::NetworkService.network_manager?
+      end
     end
   end
 end
diff --git a/src/lib/y2network/widgets/routing_table.rb b/src/lib/y2network/widgets/routing_table.rb
@@ -4,6 +4,7 @@
 require "y2network/interface"
 
 Yast.import "Label"
+Yast.import "NetworkService"
 
 module Y2Network
   module Widgets
@@ -40,6 +41,7 @@ def items
       # TODO: just workaround to make it work with old hash based CWM
       def init
         redraw_table
+        disable if Yast::NetworkService.network_manager?
       end
 
       def selected_route