ref: refs/heads/basesystem
commit 1bf8b747693193b2c0c2e70cea9c62430a024761
Author: Michal Zugec
Date: Mon Aug 31 09:44:58 2009 +0200
added route into network
---
.../network/app/controllers/network_controller.rb | 6 +++---
plugins/network/app/views/network/index.html.erb | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/network/app/controllers/network_controller.rb b/plugins/network/app/controllers/network_controller.rb
index 129aced..8db1878 100644
--- a/plugins/network/app/controllers/network_controller.rb
+++ b/plugins/network/app/controllers/network_controller.rb
@@ -29,8 +29,8 @@ class NetworkController < ApplicationController
hn = load_proxy "org.opensuse.yast.modules.yapi.network.hostname"
return false unless hn
-# rt = load_proxy "org.opensuse.yast.modules.yapi.network.routes"
-# return false unless rt
+ rt = load_proxy "org.opensuse.yast.modules.yapi.network.routes", "default"
+ return false unless rt
unless @permissions[:read]
flash[:warning] = _("No permissions for hostname module")
@@ -40,7 +40,7 @@ class NetworkController < ApplicationController
@name = hn.name
@domain = hn.domain
-# @default_route = rt.default
+ @default_route = rt.via
end
# GET /users/new
diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb
index 9f2dc79..367cbe8 100644
--- a/plugins/network/app/views/network/index.html.erb
+++ b/plugins/network/app/views/network/index.html.erb
@@ -15,7 +15,7 @@
<p>Domain: <%=h @domain %></p>
<h3>Routing</h3>
-<p>Default Route: <%=h "TODO" %></p>
+<p>Default Route: <%=h @default_route %></p>
<a href="/" class="button"><%=_("Back")%></a>
</div>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
