ref: refs/heads/backgroud_patches_bnc550934
commit c9595cdfe41b01ac9b0dc7a74026c14e10ae4b02
Author: Josef Reidinger
Date: Mon Dec 14 09:43:59 2009 +0100
enable again setting utc status, fix problem with overwriting permissions
---
.../app/controllers/systemtime_controller.rb | 2 +-
.../systemtime/app/views/systemtime/index.rhtml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/plugins/systemtime/app/controllers/systemtime_controller.rb b/plugins/systemtime/app/controllers/systemtime_controller.rb
index 6e8845f..b4c2c9d 100644
--- a/plugins/systemtime/app/controllers/systemtime_controller.rb
+++ b/plugins/systemtime/app/controllers/systemtime_controller.rb
@@ -64,6 +64,7 @@ class SystemtimeController < ApplicationController
# fields is filled. In case of errors redirect to help page, main page or just
# show flash with partial problem.
def index
+ @ntp = available_ntp
systemtime = load_proxy 'org.opensuse.yast.modules.yapi.time'
unless systemtime
@@ -82,7 +83,6 @@ class SystemtimeController < ApplicationController
@utcstatus = systemtime.utcstatus
@time = systemtime.time
@date = systemtime.date
- @ntp = available_ntp
fill_valid_timezones
begin
fill_current_region
diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml
index 9589a22..04c8d9e 100644
--- a/plugins/systemtime/app/views/systemtime/index.rhtml
+++ b/plugins/systemtime/app/views/systemtime/index.rhtml
@@ -64,6 +64,14 @@
:disabled => disabled}) %>
</span>
</p>
+ <p>
+ <% #don't use check_box helper as it generate also hidden opposite value
+ %>
+
+ <%= "disabled=\"disabled\"" if disabled %> />
+ <span class="form-details"><%=_("Hardware clock is set to UTC")%></span>
+ </p>
</fieldset>
<fieldset>
<p>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
