July 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : make this work until label_* are back
by Jiri Suchomel 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 5a54ec6dc3a88f6934e26a9ef77a1504513ac0bc Author: Jiri Suchomel <jsuchome(a)suse.cz> Date: Fri Jul 17 15:53:07 2009 +0200 make this work until label_* are back --- plugins/users/app/views/users/index.html.erb | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/users/app/views/users/index.html.erb b/plugins/users/app/views/users/index.html.erb index 74b63c2..8fbdb89 100644 --- a/plugins/users/app/views/users/index.html.erb +++ b/plugins/users/app/views/users/index.html.erb @@ -4,20 +4,16 @@ <tr> <th class="first" width=150><%=_("Login")%></th> <th><%=_("Full Name")%></th> - <th width=8%><%= label_edit %></th> + <th width=8%><%= _("Edit") %></th> <% if @permissions[:userdelete] %> - <th width=8%><%=_("SSH-Key")%></th> <th class="last" width=8%><%= label_delete %></th> - <% else %> - <th class="last" width=8%><%=_("SSH-Key")%></th> <% end %> </tr> <% for user in @users %> <tr> <td><strong><%=h user.uid %></strong></td> <td><%=h user.cn %></td> - <td><%= html_edit_link(user.id) %></td> - <td><%= link_to image_tag("/images/key_add.png", :alt => "key"), exportssh_user_path(:id=>user.id), :onclick=>"Element.show('progress')" %></td> + <td><%= link_to image_tag("/images/edit-icon.gif", :alt => :edit), {:action => :edit, :id => user.id}, :onclick=>"Element.show('progress')" %></td> <% if @permissions[:userdelete] %> <td class="last"><%= html_delete_link(user.uid) %></td> <% end %> @@ -30,3 +26,5 @@ <%= link_to _("<strong>[New User]</strong>"), new_user_path, :onclick=>"Element.show('progress')" -%><p/> </div> <% end %> + +<a href="/" class="button"><%=_("Back")%></a> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : hacks to not lose camelCased variables
by Jiri Suchomel 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 1f08a8318ef32a703d0a21cabc7d15a904038e4d Author: Jiri Suchomel <jsuchome(a)suse.cz> Date: Fri Jul 17 15:52:10 2009 +0200 hacks to not lose camelCased variables --- plugins/users/app/controllers/users_controller.rb | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/plugins/users/app/controllers/users_controller.rb b/plugins/users/app/controllers/users_controller.rb index afa0002..d719856 100644 --- a/plugins/users/app/controllers/users_controller.rb +++ b/plugins/users/app/controllers/users_controller.rb @@ -56,12 +56,14 @@ class UsersController < ApplicationController :homeDirectory => nil, :cn => nil, :uid => nil, + :uidNumber => nil, :sshkey => nil, :loginShell => "/bin/bash", :userPassword => nil, :type => "local", :id => nil ) + @user.grp_string = "" respond_to do |format| format.html # new.html.erb format.xml { render :xml => @user } @@ -90,6 +92,14 @@ class UsersController < ApplicationController @user.type = "" @user.id = @user.uid @user.grp_string = "" + + # FIXME hack, this must be done properly + # (my keys in camelCase were transformed to under_scored) + @user.uidNumber = @user.uid_number + @user.homeDirectory = @user.home_directory + @user.loginShell = @user.login_shell + @user.userPassword = @user.user_password + counter = 0 @user.grouplist.each do |group| if counter == 0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : pass homeDirectory
by Jiri Suchomel 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 5b32e87b47936a0253b38d08693323274854aff0 Author: Jiri Suchomel <jsuchome(a)suse.cz> Date: Fri Jul 17 15:51:37 2009 +0200 pass homeDirectory --- plugins/users/app/models/user.rb | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/plugins/users/app/models/user.rb b/plugins/users/app/models/user.rb index 6e74268..1a28fca 100644 --- a/plugins/users/app/models/user.rb +++ b/plugins/users/app/models/user.rb @@ -14,9 +14,6 @@ class User :type, :sshkey -# :new_uid, -# :new_login_name, -# :no_home, def id @uid end @@ -35,8 +32,6 @@ class User @loginShell = "" @userPassword = "" @type = "local" -# @new_uid = "" -# @new_login_name = "" @sshkey = "" end @@ -64,6 +59,7 @@ class User xml.tag!(:id, id ) xml.tag!(:cn, cn ) xml.tag!(:groupname, groupname) + xml.tag!(:homeDirectory, homeDirectory ) xml.tag!(:loginShell, loginShell ) xml.tag!(:uid, uid ) xml.tag!(:uidNumber, uidNumber, {:type => "integer"}) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Added more style for login-view
by Robert Lihm 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 1bdbb88dc32cbeaa4bc0d9f321fa92027a7b9261 Author: Robert Lihm <rlihm(a)lihmedia.org> Date: Fri Jul 17 15:17:44 2009 +0200 Added more style for login-view * new button * new input fields --- .../views/patch_updates/.__patch_summary.html.erb | Bin 0 -> 4096 bytes webclient/app/views/controlpanel/index.rhtml | 1 - webclient/app/views/sessions/new.rhtml | 4 +- .../public/stylesheets/images/bg-dark-gradient.png | Bin 0 -> 593 bytes webclient/public/stylesheets/style.css | 50 +++++++++++++------ 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/plugins/patch_updates/app/views/patch_updates/.__patch_summary.html.erb b/plugins/patch_updates/app/views/patch_updates/.__patch_summary.html.erb new file mode 100644 index 0000000..bc723d2 Binary files /dev/null and b/plugins/patch_updates/app/views/patch_updates/.__patch_summary.html.erb differ diff --git a/webclient/app/views/controlpanel/index.rhtml b/webclient/app/views/controlpanel/index.rhtml index 2012ba1..18d8d14 100644 --- a/webclient/app/views/controlpanel/index.rhtml +++ b/webclient/app/views/controlpanel/index.rhtml @@ -17,7 +17,6 @@ Patch plugin is not installed. <% end %> </div> -<br /> <div id="status_health_icon"> <img src="/images/button_ok.png" height="32" width="32" border="0" /> </div> diff --git a/webclient/app/views/sessions/new.rhtml b/webclient/app/views/sessions/new.rhtml index 906a5a6..da52874 100644 --- a/webclient/app/views/sessions/new.rhtml +++ b/webclient/app/views/sessions/new.rhtml @@ -12,9 +12,9 @@ <p><label for="password"><%= _("Password:") %></label> <%= password_field_tag 'password', @password %></p> - + <p> <%= submit_tag(_('Login'), :class => "button", :id => "login_button") %> - + </p> <% end %> </div> diff --git a/webclient/public/stylesheets/images/bg-dark-gradient.png b/webclient/public/stylesheets/images/bg-dark-gradient.png new file mode 100644 index 0000000..acd9bcb Binary files /dev/null and b/webclient/public/stylesheets/images/bg-dark-gradient.png differ diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index b3ab8c8..2915562 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -52,8 +52,11 @@ img { border: none; } input { - border: 1px solid #999; + border: 1px solid #ccc; padding: 3px; + color: #666; + font-size: 1em; + background: #fcfcfc; } input:focus { border: 1px solid #69c; @@ -149,15 +152,20 @@ input:focus { #login-dialogue form { display: block; background: #fefefe; - padding: 5px; + padding: 15px; margin: 7px; + overflow:hidden; + } + #login-dialogue input { + width: 97%; } #login-dialogue h2 { margin: 0; + color: #69c; } #login-dialogue label { display: block; - width: 5.5em; + margin:0 0 0.2em; } /* == Lists and Tables ==================================================== */ @@ -239,23 +247,33 @@ ul.list-2level-inline ul { text-align: center; } +/* == Form Styles ======================================================= */ -/* == Helper Styles ======================================================= */ +#login_button { + float: right; +} +/* == Helper Styles ======================================================= */ .grey-bg { background-color: #f6f6f6; } - -a.button { - color: #444; - border: 1px solid #06c; - background: #0072ba url('images/bg-head-gradient-grey.png') repeat-x scroll top center; - padding: 0.5em; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; +a.button, +input.button { + background: #eee url(images/bg-dark-gradient.png) repeat-x scroll left top; + color: #fff !important; + font-size: 12px; + font-weight: bold; + border: 1px solid #999; + cursor: pointer; + padding: 3px 10px; + text-decoration: none; + text-shadow: 0 -1px 0 #999; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + width: auto !important; } -a.button:hover { - color: #06c; +a.button:hover, +input.button:hover { + background-color: #ccc; + text-shadow: 0 -1px 0 #666; } - - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : proxy loader automatic redirects in problems to ensure same behavior of modules, proper document how to disable it if someone needs it (add disable to patch AJAX stuff)
by Josef Reidinger 17 Jul '09

17 Jul '09

ref: refs/heads/master commit bd90e6e4954fc43317b96b89f44b4d5051bf6acf Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Jul 17 14:43:20 2009 +0200 proxy loader automatic redirects in problems to ensure same behavior of modules, proper document how to disable it if someone needs it (add disable to patch AJAX stuff) --- .../app/controllers/patch_updates_controller.rb | 2 ++ .../app/controllers/system_time_controller.rb | 3 --- webclient/lib/proxy_loader.rb | 19 ++++++++++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/plugins/patch_updates/app/controllers/patch_updates_controller.rb b/plugins/patch_updates/app/controllers/patch_updates_controller.rb index ce4c0de..186fdc2 100644 --- a/plugins/patch_updates/app/controllers/patch_updates_controller.rb +++ b/plugins/patch_updates/app/controllers/patch_updates_controller.rb @@ -16,6 +16,8 @@ class PatchUpdatesController < ApplicationController patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all unless patch_updates + erase_redirect_results #reset all redirects + erase_render_results flash.clear #no flash from load_proxy render :partial => "patch_summary", :locals => { :patch => nil } return false diff --git a/plugins/systemtime/app/controllers/system_time_controller.rb b/plugins/systemtime/app/controllers/system_time_controller.rb index 138a14a..094c573 100644 --- a/plugins/systemtime/app/controllers/system_time_controller.rb +++ b/plugins/systemtime/app/controllers/system_time_controller.rb @@ -66,7 +66,6 @@ class SystemTimeController < ApplicationController redirect_to root_path return false end - @timezones = systemtime.timezones @timezone = systemtime.timezone @@ -89,7 +88,6 @@ class SystemTimeController < ApplicationController def update_time t = load_proxy 'org.opensuse.yast.modules.yapi.time' - # FIXME: add a 'redirect_to' unless t return false end @@ -118,7 +116,6 @@ class SystemTimeController < ApplicationController def update_timezone t = load_proxy 'org.opensuse.yast.modules.yapi.time' - # FIXME: add a 'redirect_to' unless t return false end diff --git a/webclient/lib/proxy_loader.rb b/webclient/lib/proxy_loader.rb index 6187dfa..4e94aae 100644 --- a/webclient/lib/proxy_loader.rb +++ b/webclient/lib/proxy_loader.rb @@ -1,5 +1,6 @@ # = ProxyLoader module -# Modules handles finding and loading proxy. It take care about pottential problems +# Modules handles finding and loading proxy. It take care about pottential +# problems and redirect in problems to correct page. # == requirements # Use ExceptionLogger module to it run. Intended to be used in Controller. # == Usage @@ -14,6 +15,19 @@ # end # ... # +# In case you don't want redirect (like in AJAX handlers) +# include ProxyLoader +# def index +# @systemtime = load_proxy 'org.opensuse.yast.modules.yapi.time' +# +# unless @systemtime +# erase_redirect_results +# erase_render_results +# #error handling +# return false +# end +# +# module ProxyLoader #Finds proxy and find its result. @@ -27,6 +41,7 @@ module ProxyLoader unless proxy logger.warn "Couldn't find proxy for #{name}" flash[:error] = "Cannot find service on target machine for #{name}." + redirect_to root_path @permissions = nil return nil end @@ -49,9 +64,11 @@ module ProxyLoader rescue ActiveResource::ClientError => e flash[:error] = YaST::ServiceResource.error(e) ExceptionLogger.log_exception e + redirect_to root_path rescue Exception => e flash[:error] = e.message ExceptionLogger.log_exception e + redirect_to root_path end return ret -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58109 - /trunk/printer/src/Printer.ycp
by jsmeix＠svn.opensuse.org 17 Jul '09

17 Jul '09

Author: jsmeix Date: Fri Jul 17 14:22:20 2009 New Revision: 58109 URL: http://svn.opensuse.org/viewcvs/yast?rev=58109&view=rev Log: Fixed bug #520642 by a 'sleep one second' workaround. Modified: trunk/printer/src/Printer.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=5810… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Fri Jul 17 14:22:20 2009 @@ -1735,7 +1735,14 @@ // see https://bugzilla.novell.com/show_bug.cgi?id=395760 // and http://www.cups.org/str.php?L2848 if( "" != default_paper_size ) - { // The following command fails intentionally if the queue has no PPD file - i.e. when it is a "raw" queue + { // Since CUPS 1.4 there is a weird timing-effect regarding which defaults 'lpoptions -l' reports + // after the defaults have been changed directly after a new queue was set up + // see https://bugzilla.novell.com/show_bug.cgi?id=520642 + // and http://www.cups.org/str.php?L3264 + // Regardless of the DirtyCleanInterval setting it works when there is one second delay + // between a new queue was set up and before its defaults were changed: + sleep( 1000 ); + // The following command fails intentionally if the queue has no PPD file - i.e. when it is a "raw" queue // (a queue with a "System V style interface script" cannot be set up with YaST). // '\>' is used to find an available choice also when it is the last value on the line. // Note the YCP quoting: \\< becomes \< and \\> becomes \> in the commandline. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Add few comments
by Josef Reidinger 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 84ed7619ee9264f866656a3c0fb727edd72407c2 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Jul 17 14:15:21 2009 +0200 Add few comments --- .../app/controllers/system_time_controller.rb | 24 +++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/app/controllers/system_time_controller.rb b/plugins/systemtime/app/controllers/system_time_controller.rb index 2f5f9df..138a14a 100644 --- a/plugins/systemtime/app/controllers/system_time_controller.rb +++ b/plugins/systemtime/app/controllers/system_time_controller.rb @@ -1,8 +1,13 @@ require 'yast/service_resource' require 'systemtime' -# FIXME: add comments to explain functions +# = SystemTimeController +# Provides all functionality, that handles time management module. +# The most functionality around time handling is in rest-service and this +# controller just provide handling of different exceptions and UI features. +# Update time and timezone is separated as timezone update doesn't neccesarry +# require also time update and that could set time to bad value. class SystemTimeController < ApplicationController before_filter :login_required layout 'main' @@ -10,6 +15,8 @@ class SystemTimeController < ApplicationController #helpers private + # Fills @+valid+ field that represents valid regions with informations from + # @+timezone+ field. def fill_valid_timezones @valid.clear @timezones.each do |region| @@ -17,6 +24,10 @@ class SystemTimeController < ApplicationController end end + # Fills current region name in field @+region+. Requires filled @+timezones+ + # and @+timezone+ fields + # throws:: Exception if current timezone is not in any known region. @+region+ + # field in this case is +nil+. def fill_current_region @timezones.each do |region| region.entries.each do |entry| @@ -40,6 +51,9 @@ class SystemTimeController < ApplicationController @valid = [] end + # Index handler. Loads information from backend and if success all required + # fields is filled. In case of errors redirect to help page, main page or just + # show flash with partial problem. def index systemtime = load_proxy 'org.opensuse.yast.modules.yapi.time' @@ -69,6 +83,9 @@ class SystemTimeController < ApplicationController end end + # Update time handler. Sets to backend new time. If time is set to future it + # still shows problems. Now it invalidate session for logged user.If + # everything goes fine it redirect to index def update_time t = load_proxy 'org.opensuse.yast.modules.yapi.time' @@ -96,6 +113,8 @@ class SystemTimeController < ApplicationController redirect_to :action => :index end + # Update time handler. Sets to backend new timezone. If everything goes fine + # it redirect to index def update_timezone t = load_proxy 'org.opensuse.yast.modules.yapi.time' @@ -120,6 +139,9 @@ class SystemTimeController < ApplicationController redirect_to :action => :index end + + #AJAX function that renders new timezones for selected region. Expected + # initialized values from index call. def timezones_for_region region = "" @timezones.each do |r| -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : parse datetime info on backend side
by Josef Reidinger 17 Jul '09

17 Jul '09

ref: refs/heads/master commit f8680d91879275b55bc4fd0ef1292dfe986ad7e6 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Jul 17 13:55:56 2009 +0200 parse datetime info on backend side --- .../app/controllers/system_time_controller.rb | 46 +++--- .../systemtime/app/views/system_time/index.rhtml | 192 ++++++++++---------- plugins/systemtime/lib/systemtime.rb | 7 +- .../test/functional/systemtime_controller_test.rb | 10 +- 4 files changed, 131 insertions(+), 124 deletions(-) diff --git a/plugins/systemtime/app/controllers/system_time_controller.rb b/plugins/systemtime/app/controllers/system_time_controller.rb index 9f0136e..2f5f9df 100644 --- a/plugins/systemtime/app/controllers/system_time_controller.rb +++ b/plugins/systemtime/app/controllers/system_time_controller.rb @@ -18,22 +18,15 @@ class SystemTimeController < ApplicationController end def fill_current_region - # FIXME: @region can remain unset @timezones.each do |region| region.entries.each do |entry| - if entry.id == @systemtime.timezone + if entry.id == @timezone @region = region + return end end end - end - - def fill_date_and_time (timedate) - # FIXME: such conversions should be in a model - @time = timedate[timedate.index(" - ")+3,8] - @date = timedate[0..timedate.index(" - ")-1] - #convert date to format for datepicker - @date.sub!(/^(\d+)-(\d+)-(\d+)/,'\3/\2/\1') + raise _("Unknown timezone #{@timezone} on host") end public @@ -48,9 +41,9 @@ class SystemTimeController < ApplicationController end def index - @systemtime = load_proxy 'org.opensuse.yast.modules.yapi.time' + systemtime = load_proxy 'org.opensuse.yast.modules.yapi.time' - unless @systemtime + unless systemtime return false end @@ -61,10 +54,19 @@ class SystemTimeController < ApplicationController end - @timezones = @systemtime.timezones + @timezones = systemtime.timezones + @timezone = systemtime.timezone + @utcstatus = systemtime.utcstatus + @time = systemtime.time + @date = systemtime.date fill_valid_timezones - fill_current_region - fill_date_and_time((a)systemtime.time) + begin + fill_current_region + rescue Exception => e + flash[:warning] = e.message + ExceptionLogger.log_exception e + redirect_to root_path + end end def update_time @@ -78,17 +80,17 @@ class SystemTimeController < ApplicationController fill_proxy_with_time t,params begin - response = t.save + t.save flash[:notice] = _('Settings have been written.') rescue Timeout::Error => e #do nothing as if you move time to future it throws this exception log.debug "Time moved to future" rescue ActiveResource::ClientError => e flash[:error] = YaST::ServiceResource.error(e) - log_exception e + ExceptionLogger.log_exception e rescue Exception => e flash[:error] = e.message - log_exception e + ExceptionLogger.log_exception e end redirect_to :action => :index @@ -102,17 +104,17 @@ class SystemTimeController < ApplicationController return false end - fill_proxy_with_time t,params,@@systemtime + fill_proxy_with_timezone t,params, t.timezones begin - response = t.save + t.save flash[:notice] = _('Settings have been written.') rescue ActiveResource::ClientError => e flash[:error] = YaST::ServiceResource.error(e) - log_exception e + ExceptionLogger.log_exception e rescue Exception => e flash[:error] = e.message - log_exception e + ExceptionLogger.log_exception e end redirect_to :action => :index diff --git a/plugins/systemtime/app/views/system_time/index.rhtml b/plugins/systemtime/app/views/system_time/index.rhtml index 8324f2a..431ec96 100644 --- a/plugins/systemtime/app/views/system_time/index.rhtml +++ b/plugins/systemtime/app/views/system_time/index.rhtml @@ -1,116 +1,118 @@ <% if @permissions %> -<%= javascript_include_tag "nogray_time_picker" %> -<% javascript_tag do -%> - $(document).ready( function() { - $(".datepicker").datepicker( { dateFormat: 'dd/mm/yy'} ); - }); -<% end -%> + <%= javascript_include_tag "nogray_time_picker" %> + <% javascript_tag do -%> + $(document).ready( function() { + $(".datepicker").datepicker( { dateFormat: 'dd/mm/yy'} ); + }); + <% end -%> -<%= javascript_include_tag :defaults %> -<% disabled = ! @permissions[:write] %> + <%= javascript_include_tag :defaults %> + <% disabled = ! @permissions[:write] %> -<h2><%=_("Configure timezone")%></h2> -<% form_tag '/system_time/update_timezone', :class => 'container' do %> - <table summary="<%= _("Table for settings timezone for target machine.") %>"> - <tr> + <h2><%=_("Configure timezone")%></h2> + <% form_tag '/system_time/update_timezone', :class => 'container' do %> + <table summary="<%= _("Table for settings timezone for target machine.") %>"> + <tr> - <td> - <label for="region"> - <%=_("Region:")%> - </label> - </td> - <% name = @region.name rescue "" - @valid = Array.new unless @valid -%> - <td><%= select_tag "region", options_for_select(@valid, name), :disabled => disabled %></td> - - </tr> - <tr> + <td> + <label for="region"> + <%=_("Region:")%> + </label> + </td> + <% #region is always non-nil as it is prerequisites which throws exception + %> + <td> + <%= select_tag "region", options_for_select(@valid, @region.name), :disabled => disabled %> + </td> + </tr> + <tr> - <td> - <label for="timezone"> - <%=_("Timezone:")%> - </label> - </td> - <td id="timezones"> - <%= render(:partial => 'timezones', - :locals => {:region => @region, :default => @systemtime.timezone, - :disabled => disabled}) %> - </td> - </tr> + <td> + <label for="timezone"> + <%=_("Timezone:")%> + </label> + </td> + + <td id="timezones"> + <%= render(:partial => 'timezones', + :locals => {:region => @region, :default => @timezone, + :disabled => disabled}) %> + </td> + </tr> - <% if @systemtime.utcstatus != "UTConly" %> + <% if @utcstatus != "UTConly" %> + + <tr> + <td> + <label for="utc"> + <%=_("Hardware clock is set to UTC")%> + </label> + </td> + <td> + <% #don't use check_box helper as it generate also hidden opposite value + %> + <input type="checkbox" name="utc" id="utc" value="true" + <%= @utcstatus == "UTC" ? "checked" : "" %> + <%= "disabled=\"disabled\"" if disabled %> /> + </td> + </tr> + + <% end %> <tr> + <td/> <td> - <label for="utc"> - <%=_("Hardware clock is set to UTC")%> + <%= submit_tag _("Save"), :onclick=>"Element.show('progress')", :disabled=> disabled, :class => 'button' -%> + </td> + </tr> + </table> + <% end %> + <h2><%=_("Manually configure time")%></h2> + <% form_tag '/system_time/update_time', :class => 'container' do %> + <table summary="<%= _("Manual time configuration table, where user selects data and time for target machine") %>"> + <tr> + <td> + <label for="date_date"> + <%= _("Date") %> </label> </td> <td> - <% #don't use check_box helper as it generate also hidden opposite value - %> - <input type="checkbox" name="utc" id="utc" value="true" - <%= @systemtime.utcstatus == "UTC" ? "checked" : "" %> - <%= "disabled=\"disabled\"" if disabled %> /> + <%= text_field "date","date", :class => :datepicker, + :disabled=> disabled, :value => @date + %> </td> </tr> - <% end %> - - <tr> - <td/> - <td> - <%= submit_tag _("Save"), :onclick=>"Element.show('progress')", :disabled=> disabled, :class => 'button' -%> - </td> - </tr> - </table> -<% end %> -<h2><%=_("Manually configure time")%></h2> -<% form_tag '/system_time/update_time', :class => 'container' do %> - <table summary="<%= _("Manual time configuration table, where user selects data and time for target machine") %>"> - <tr> - <td> - <label for="date_date"> - <%= _("Date") %> - </label> - </td> - <td> - <%= text_field "date","date", :class => :datepicker, - :disabled=> disabled, :value => @date - %> - </td> - </tr> - - <tr> - <td> - <label for="currenttime"> - <%= _("Time") %> - </label> - </td> - <td><%= text_field_tag "currenttime", @time, :disabled=> disabled %></td> - </tr> - - <tr> - <td></td> - <td> - - <%= submit_tag _("Save"), :onclick=>"Element.show('progress')", - :disabled=> disabled, :class => 'button' -%> - - </td> - </tr> - </table> -<% end %> - -<%= observe_field(:region, - :frequency => 0.25, - :update => :timezones, - :url => { :action => :timezones_for_region }, - :with => "'disabled=' + "+ (disabled ? "true":"false")+" + '&value=' +value") %> - <% end %> \ No newline at end of file + <tr> + <td> + <label for="currenttime"> + <%= _("Time") %> + </label> + </td> + <td><%= text_field_tag "currenttime", @time, :disabled=> disabled %></td> + </tr> + + <tr> + <td></td> + <td> + + <%= submit_tag _("Save"), :onclick=>"Element.show('progress')", + :disabled=> disabled, :class => 'button' -%> + + </td> + </tr> + </table> + <% end %> + + <%= observe_field(:region, + :frequency => 0.25, + :update => :timezones, + :url => { :action => :timezones_for_region }, + :with => "'disabled=' + "+ (disabled ? "true":"false")+" + '&value=' +value") %> +<% end %> \ No newline at end of file diff --git a/plugins/systemtime/lib/systemtime.rb b/plugins/systemtime/lib/systemtime.rb index 6df26ea..4b61e52 100644 --- a/plugins/systemtime/lib/systemtime.rb +++ b/plugins/systemtime/lib/systemtime.rb @@ -1,8 +1,8 @@ # Systemtime def fill_proxy_with_time(proxy,params) - arr = params[:date][:date].split("/") - proxy.time = "#{arr[2]}-#{arr[0]}-#{arr[1]} - "+params[:currenttime] + proxy.date = params[:date][:date] + proxy.time = params[:currenttime] proxy.timezones = [] #not needed anymore proxy.utcstatus = "" proxy.timezone = "" @@ -19,7 +19,7 @@ def fill_proxy_with_timezone(proxy,params,timezones) region.entries.each do |e| if (e.name == params[:timezone]) - t.timezone = e.id + proxy.timezone = e.id break end end @@ -33,5 +33,6 @@ def fill_proxy_with_timezone(proxy,params,timezones) end proxy.time = "" + proxy.date = "" proxy.timezones = [] #not needed anymore end \ No newline at end of file diff --git a/plugins/systemtime/test/functional/systemtime_controller_test.rb b/plugins/systemtime/test/functional/systemtime_controller_test.rb index f1bc5cc..77977db 100644 --- a/plugins/systemtime/test/functional/systemtime_controller_test.rb +++ b/plugins/systemtime/test/functional/systemtime_controller_test.rb @@ -33,13 +33,14 @@ class SystemTimeControllerTest < ActionController::TestCase class Result - attr_accessor :time, :timezone, :utcstatus, :timezones, :saved + attr_accessor :time, :date, :timezone, :utcstatus, :timezones, :saved def fill @timezones = [ Region.new("Europe","Europe/Prague",[ Entry.new("Europe/Prague","Czech Republic" )]) ] - @time = "2009-07-02 - 12:18:00" + @time = "12:18:00" + @date = "07/02/2009" @utcstatus = "true" @timezone = "Europe/Prague" # @available = [Lang.new("cs_CZ","cestina"), @@ -79,8 +80,9 @@ class SystemTimeControllerTest < ActionController::TestCase assert assigns(:permissions)[:read] assert assigns(:permissions)[:write] assert assigns(:time) - # assert assigns(:timezone), "Europe/Prague" - # assert assigns(:utcstatus) + assert assigns(:date) + assert_equal assigns(:timezone), "Europe/Prague" + assert assigns(:utcstatus) end def test_access_without_write_permissions -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : parse datetime info on backend side
by Josef Reidinger 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 500fbd2dfbd14fe1674a6d4f43220f4fbb8826ad Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Jul 17 13:55:51 2009 +0200 parse datetime info on backend side --- .../time/app/controllers/systemtimes_controller.rb | 3 +- plugins/time/app/models/systemtime.rb | 23 +++++++++++++------ .../test/functional/systemtimes_controller_test.rb | 3 +- plugins/time/test/unit/systemtime_test.rb | 12 +++++++--- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/plugins/time/app/controllers/systemtimes_controller.rb b/plugins/time/app/controllers/systemtimes_controller.rb index 1f88961..0cedabe 100644 --- a/plugins/time/app/controllers/systemtimes_controller.rb +++ b/plugins/time/app/controllers/systemtimes_controller.rb @@ -22,7 +22,8 @@ class SystemtimesController < ApplicationController end @systemtime = Systemtime.new - @systemtime.datetime = root[:time] + @systemtime.time = root[:time] + @systemtime.date = root[:date] @systemtime.timezone = root[:timezone] @systemtime.utcstatus = root[:utcstatus] @systemtime.save diff --git a/plugins/time/app/models/systemtime.rb b/plugins/time/app/models/systemtime.rb index 79cafe3..adf826d 100644 --- a/plugins/time/app/models/systemtime.rb +++ b/plugins/time/app/models/systemtime.rb @@ -2,13 +2,18 @@ class Systemtime @@timezones = Array.new() - attr_accessor :datetime, + attr_accessor :date, + :time, :timezone, :utcstatus private def parse_response(response) - @datetime = response["time"] + timedate = response["time"] + @time = timedate[timedate.index(" - ")+3,8] + @date = timedate[0..timedate.index(" - ")-1] + #convert date to format for datepicker + @date.sub!(/^(\d+)-(\d+)-(\d+)/,'\3/\2/\1') @utcstatus= response["utcstatus"] @timezone = response["timezone"] if response["zones"] @@ -41,15 +46,18 @@ class Systemtime def save settings = {} - unless @timezone.nil? or @timezone.empty? + if @timezone and !(a)timezone.empty? settings["timezone"] = @timezone end - unless @utcstatus.nil? or @utcstatus.empty? + if @utcstatus and !(a)utcstatus.empty? settings["utcstatus"] = @utcstatus end need_rescue = false - unless @datetime.nil? or @datetime.empty? - settings["currenttime"] = @datetime + if (@date and !(a)date.empty?) and + (@time and !(a)time.empty?) + date = @date.split("/") + datetime = "#{date[2]}-#{date[0]}-#{date[1]} - "+@time + settings["currenttime"] = datetime need_rescue = true end begin @@ -68,7 +76,8 @@ class Systemtime xml.instruct! unless options[:skip_instruct] xml.systemtime do - xml.tag!(:time, @datetime ) + xml.tag!(:time, @time ) + xml.tag!(:date, @date ) xml.tag!(:timezone, @timezone ) xml.tag!(:utcstatus, @utcstatus ) xml.timezones({:type => "array"}) do diff --git a/plugins/time/test/functional/systemtimes_controller_test.rb b/plugins/time/test/functional/systemtimes_controller_test.rb index 8da320a..4aa3ba5 100644 --- a/plugins/time/test/functional/systemtimes_controller_test.rb +++ b/plugins/time/test/functional/systemtimes_controller_test.rb @@ -42,6 +42,7 @@ class SystemtimesControllerTest < ActionController::TestCase assert time assert_equal DATA[:time][:timezone], time.timezone assert_equal DATA[:time][:utcstatus], time.utcstatus - assert_nil time.datetime + assert_nil time.date + assert_nil time.time end end \ No newline at end of file diff --git a/plugins/time/test/unit/systemtime_test.rb b/plugins/time/test/unit/systemtime_test.rb index d2db794..f0fd501 100644 --- a/plugins/time/test/unit/systemtime_test.rb +++ b/plugins/time/test/unit/systemtime_test.rb @@ -57,7 +57,8 @@ class LanguageTest < ActiveSupport::TestCase YastService.stubs(:Call).with("YaPI::TIME::Read",read_arguments).returns(result) @model.find - assert_equal(result["time"], @model.datetime) + assert_equal("02/07/2009", @model.date) + assert_equal("12:18:00", @model.time) assert_equal("Europe/Prague", @model.timezone) assert_equal("true", @model.utcstatus) assert_equal(Test_timezones,(a)model.timezones) @@ -81,7 +82,8 @@ class LanguageTest < ActiveSupport::TestCase data = read_response @model.timezone = data["timezone"] @model.utcstatus = data["utcstatus"] - @model.datetime = data["currenttime"] + @model.date = "02/07/2009" + @model.time = "12:18:00" @model.timezones = Test_timezones response = Hash.from_xml((a)model.to_xml) @@ -89,7 +91,8 @@ class LanguageTest < ActiveSupport::TestCase assert_equal(data["timezone"], response["timezone"]) assert_equal(data["utcstatus"], response["utcstatus"]) - assert_equal(data["currenttime"], response["time"]) + assert_equal("12:18:00", response["time"]) + assert_equal("02/07/2009", response["date"]) zone_response = Test_timezones zone_response.each { |zone| @@ -114,7 +117,8 @@ class LanguageTest < ActiveSupport::TestCase data = read_response @model.timezone = data["timezone"] @model.utcstatus = data["utcstatus"] - @model.datetime = data["currenttime"] + @model.date = "02/07/2009" + @model.time = "12:18:00" @model.timezones = Test_timezones assert_not_nil((a)model.to_json) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58108 - /tags/stable-2_18_6/control-center/
by kmachalkova＠svn.opensuse.org 17 Jul '09

17 Jul '09

Author: kmachalkova Date: Fri Jul 17 13:44:31 2009 New Revision: 58108 URL: http://svn.opensuse.org/viewcvs/yast?rev=58108&view=rev Log: Created tag stable-2_18_6 for control-center Added: tags/stable-2_18_6/control-center/ - copied from r58107, trunk/control-center/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0